hplip 諸々更新

%changelog
- change configure option to --enable-hpijs-install
- add Provides: hpijs
- change ppd installation path to %{_datadir}/foomatic/db/source/PPD/HP
- update Source1 (hplip.desktop.vine)
- update Patch0 (hplip-3.11.5-gksu.patch)
- add Patch1 to fix udev old syntax (hplip-udev-rules.patch)

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@4127 ec354946-7b23-47d6-9f5a-488ba84defc7

h/hplip/hplip-vl.spec

@@ -3,14 +3,17 @@ Summary:	HP printer drivers & utilities for Linux
 Summary(ja): 	HP プリンタ用の Linux 向けドライバとユーティリティ
 Name:		hplip
 Version:	3.11.5
-Release: 	1%{?_dist_release}
+Release: 	2%{?_dist_release}
 Source0:	%{name}-%{version}.tar.gz
 Source1:	hplip.desktop.vine
-Patch0:		hplip-3.9.4b-gksu.patch
+Patch0:		hplip-3.11.5-gksu.patch
+Patch1:		hplip-udev-rules.patch
 License:	GPL/MIT
 Group:		Applications/Publishing
 URL:		http://hplipopensource.com/hplip-web/index.html
 
+Provides:	hpijs
+
 Requires:	cups
 Requires:	dbus
 Requires:	foomatic
@@ -116,6 +119,7 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
 %prep
 %setup -q
 %patch0 -p1 -b .gksu
+%patch1 -p1 -b .udev-rules
 
 %build
 %configure --enable-doc-build \
@@ -127,13 +131,15 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
            --enable-dbus-build \
            --enable-qt4 \
            --disable-qt3 \
-           --disable-hpijs-install \
+           --enable-hpijs-install \
            --enable-hpcups-install \
-           --disable-foomatic-ppd-install \
+           --enable-cups-drv-install \
            --enable-foomatic-drv-install \
+           --disable-cups-ppd-install \
+           --disable-foomatic-ppd-install \
            --with-cupsbackenddir=%{_libdir}/cups/backend \
            --with-cupsfilterdir=%{_libdir}/cups/filter \
-           --with-hpppddir=%{_datadir}/cups/model/foomatic
+           --with-hpppddir=%{_datadir}/foomatic/db/source/PPD/HP
 %{__make}
 
 
@@ -144,10 +150,6 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
 # install modified .desktop
 %{__install} -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}/%{_datadir}/applications/hplip.desktop
 
-# remove hpijs.
-#%{__rm} -rf ${RPM_BUILD_ROOT}/%{_bindir}/hpijs
-#%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/cups/filter/hplipjs
-
 # remove unpacked files.
 %{__rm} -rf ${RPM_BUILD_ROOT}/%{_sysconfdir}/sane.d
 
@@ -214,6 +216,7 @@ fi
 %{_bindir}/hp-timedate
 %{_bindir}/hp-unload
 %{_bindir}/hp-wificonfig
+%{_bindir}/hpijs
 %{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %{_datadir}/hplip/__init__.py
 %{_datadir}/hplip/align.py
@@ -253,11 +256,7 @@ fi
 %{_datadir}/hplip/wificonfig.py
 %{_datadir}/cups/drv/hp/hpcups.drv
 %{_datadir}/cups/drv/hp/hpijs.drv
-%{_datadir}/cups/model/foomatic/hp-*
-%{_datadir}/cups/model/foomatic/HP-Fax-hpcups.ppd.gz
-%{_datadir}/cups/model/foomatic/HP-Fax2-hpcups.ppd.gz
-%{_datadir}/cups/model/foomatic/HP-Fax3-hpcups.ppd.gz
-%{_datadir}/cups/model/foomatic/HP-Fax4-hpcups.ppd.gz
+%{_datadir}/foomatic/db/source/PPD/HP
 %{_libdir}/cups/backend/hp
 %{_libdir}/cups/backend/hpfax
 %{_libdir}/cups/filter/hpcups
@@ -309,6 +308,14 @@ fi
 
 
 %changelog
+* Sun Jun 12 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 3.11.5-2
+- change configure option to --enable-hpijs-install
+- add Provides: hpijs
+- change ppd installation path to %{_datadir}/foomatic/db/source/PPD/HP
+- update Source1 (hplip.desktop.vine)
+- update Patch0 (hplip-3.11.5-gksu.patch)
+- add Patch1 to fix udev old syntax (hplip-udev-rules.patch)
+
 * Tue Mar 15 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 3.11.5-1
 - new upstream release
 - change configure option: disable qt3 and enable qt4