ソースの更新

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

h/hplip/hplip-vl.spec

@@ -2,8 +2,8 @@
 Summary:	HP printer drivers & utilities for Linux
 Summary(ja): 	HP プリンタ用の Linux 向けドライバとユーティリティ
 Name:		hplip
-Version:	3.9.4b
-Release: 	3%{?_dist_release}
+Version:	3.11.5
+Release: 	1%{?_dist_release}
 Source0:	%{name}-%{version}.tar.gz
 Source1:	hplip.desktop.vine
 Patch0:		hplip-3.9.4b-gksu.patch
@@ -11,13 +11,27 @@ License:	GPL/MIT
 Group:		Applications/Publishing
 URL:		http://hplipopensource.com/hplip-web/index.html
 
-Requires:	ghostscript, cups, foomatic, openssl
-Requires:	libjpeg, python-imaging, hal, dbus
+Requires:	cups
+Requires:	dbus
+Requires:	foomatic
+Requires:	ghostscript
+Requires:	libjpeg
+Requires:	openssl
+Requires:	python-imaging
+Requires:	dbus-python
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	gksu
-BuildRequires:	python-devel >= 2.3 , cups-devel, libusb-devel
-BuildRequires:	net-snmp-devel, libjpeg-devel, sane-devel
+BuildRequires:	cups-devel
 BuildRequires:	dbus-devel
+BuildRequires:	libusb-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	net-snmp-devel
+BuildRequires:	openssl-devel
+BuildRequires:	python-devel >= 2.3
+BuildRequires:	sane-devel
+BuildRequires:	PyQt4
+# to force to use PyQt4
+BuildConflicts:	PyQt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Packager:	kazutaka
@@ -26,7 +40,7 @@ Packager:	kazutaka
 # find-requires shows strange error. 
 #  %{_datadir}/hplip/base/kirbybase.py and pexpect.py
 # So, below option is added to aboid this.
-AutoReq:	False
+#AutoReq:	False
 
 %description
 HPLIP is an HP developed solution for printing, scanning, and
@@ -67,7 +81,9 @@ Summary:	HPLIP graphical tools
 Summary(ja):	HPLIP 用 GUI ツール
 Group:		Applications/System
 License:	GPL/MIT
-Requires:	PyQt, %{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release}
+Requires:	PyQt4
+Requires:	notify-python
 
 %description gui
 HP Device manager (toolbox) is a graphical utility including 
@@ -84,7 +100,8 @@ Summary:	SANE driver for scanners in HP's multi-function devices
 Summary(ja):	HP 複合機のスキャナ用 SANE ドライバ
 Group:		System Environment/Libraries
 License:	GPL/MIT
-Requires:	%{name}-libs = %{version}-%{release}, sane
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	sane
 
 %description -n libsane-hpaio
 SANE driver for scanners in HP inkjet and laser based multi-function 
@@ -108,10 +125,12 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
            --enable-gui-build \
            --enable-fax-build \
            --enable-dbus-build \
-           --enable-qt3 \
-           --disable-qt4 \
+           --enable-qt4 \
+           --disable-qt3 \
+           --disable-hpijs-install \
+           --enable-hpcups-install \
            --disable-foomatic-ppd-install \
-           --disable-foomatic-xml-install \
+           --enable-foomatic-drv-install \
            --with-cupsbackenddir=%{_libdir}/cups/backend \
            --with-cupsfilterdir=%{_libdir}/cups/filter \
            --with-hpppddir=%{_datadir}/cups/model/foomatic
@@ -126,13 +145,11 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
 %{__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
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_datadir}/cups/drv/hp/hpijs.drv
+#%{__rm} -rf ${RPM_BUILD_ROOT}/%{_bindir}/hpijs
+#%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/cups/filter/hplipjs
 
 # remove unpacked files.
-%{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/cups/model/foomatic/hp-*
-%{__rm} -rf ${RPM_BUILD_ROOT}%{_libdir}/libhpip.so
+%{__rm} -rf ${RPM_BUILD_ROOT}/%{_sysconfdir}/sane.d
 
 # remove unnecessary files.
 %{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/libhpip.la
@@ -142,13 +159,15 @@ HP インクジェット及びレーザープリンタ複合機のスキャナ
 %{__rm} -rf ${RPM_BUILD_ROOT}/%{python_sitearch}/pcardext.la
 %{__rm} -rf ${RPM_BUILD_ROOT}/%{python_sitearch}/scanext.la
 %{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/sane/libsane-hpaio.la
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_sysconfdir}/sane.d
 
 %clean
 %__rm -rf ${RPM_BUILD_ROOT}
 
 
-%post
+%post libs
+/sbin/ldconfig
+
+%postun libs
 /sbin/ldconfig
 
 %post gui
@@ -171,7 +190,7 @@ fi
 %{_bindir}/hp-check
 %{_bindir}/hp-clean
 %{_bindir}/hp-colorcal
-%{_bindir}/hp-devicesetup
+%{_bindir}/hp-devicesettings
 %{_bindir}/hp-fab
 %{_bindir}/hp-faxsetup
 %{_bindir}/hp-firmware
@@ -194,6 +213,7 @@ fi
 %{_bindir}/hp-testpage
 %{_bindir}/hp-timedate
 %{_bindir}/hp-unload
+%{_bindir}/hp-wificonfig
 %{_datadir}/hal/fdi/preprobe/10osvendor/20-hplip-devices.fdi
 %{_datadir}/hplip/__init__.py
 %{_datadir}/hplip/align.py
@@ -206,7 +226,7 @@ fi
 %{_datadir}/hplip/data/models
 %{_datadir}/hplip/data/pcl
 %{_datadir}/hplip/data/ps
-%{_datadir}/hplip/devicesetup.py
+%{_datadir}/hplip/devicesettings.py
 %{_datadir}/hplip/fax
 %{_datadir}/hplip/faxsetup.py
 %{_datadir}/hplip/firmware.py
@@ -230,19 +250,32 @@ fi
 %{_datadir}/hplip/testpage.py
 %{_datadir}/hplip/timedate.py
 %{_datadir}/hplip/unload.py
-%{_datadir}/cups/model/foomatic/HP-Fax-hplip.ppd.gz
-%{_datadir}/cups/model/foomatic/HP-Fax2-hplip.ppd.gz
+%{_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
 %{_libdir}/cups/backend/hp
 %{_libdir}/cups/backend/hpfax
 %{_libdir}/cups/filter/hpcups
+%{_libdir}/cups/filter/hpcac
+%{_libdir}/cups/filter/hpcupsfax
+%{_libdir}/cups/filter/hplipjs
+%{_libdir}/cups/filter/hpps
+%{_libdir}/cups/filter/pstotiff
 %config(noreplace) %{_sysconfdir}/hp/hplip.conf
+%{_sysconfdir}/cups/pstotiff.convs
+%{_sysconfdir}/cups/pstotiff.types
 %{_sysconfdir}/udev/rules.d/55-hpmud.rules
 %{_sysconfdir}/udev/rules.d/56-hpmud_support.rules
 %{_localstatedir}/lib/hp
 
 %files libs
 %defattr(-,root,root)
-%{_libdir}/libhpip.so.*
+%{_libdir}/libhpip.so*
 %{_libdir}/libhpmud.so*
 %{python_sitearch}/cupsext.so
 %{python_sitearch}/hpmudext.so
@@ -266,8 +299,7 @@ fi
 %{_datadir}/hplip/setup.py
 %{_datadir}/hplip/systray.py
 %{_datadir}/hplip/toolbox.py
-%{_datadir}/hplip/ui
-%{_datadir}/hplip/plugins
+%{_datadir}/hplip/ui4
 %{_datadir}/applications/hplip.desktop
 %{_sysconfdir}/xdg/autostart/hplip-systray.desktop
 
@@ -277,6 +309,18 @@ fi
 
 
 %changelog
+* Tue Mar 15 2011 Kazutaka HARADA <kazutaka@vinelinux.org> 3.11.5-1
+- new upstream release
+- change configure option: disable qt3 and enable qt4
+- add configure option: --enable-foomatic-drv-install
+- add BuildRequires: openssl-devel
+- add Requires: dbus-python
+- add Requires: notify-python (gui)
+- change Requires: PyQt to PyQt4 (gui)
+- add BuildConflicts: PyQt
+- add ppds below %{_datadir}/cups/model/foomatic/hp-*
+  because foomatic (>= 4.0.3) drop PPDs for HP printers.
+
 * Fri Jul 24 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 3.9.4b-3
 - add Patch0 to require root privilege (via gksu) when adding printer
 - add Requires: gksu