diff --git a/hpijs-standalone.spec b/hpijs-standalone.spec index f1f67a6..b750123 100644 --- a/hpijs-standalone.spec +++ b/hpijs-standalone.spec @@ -17,9 +17,9 @@ Summary: HPIJS stand-alone # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc Version: 1.7.4a -Release: 6 +Release: 15 Group: Hardware/Printing -License: BSD License and BSD-like +License: BSD License and BSD-like, In general all applications are covered by the GNU General Public License (GPL) and the backend is covered by a MIT license. The printer driver HPIJS uses a BSD license. See the COPYING file in the HPLIP tar ball for more details. URL: http://hpinkjet.sourceforge.net/ # Source0...Source9 is for sources from HP: # URL for Source0: http://switch.dl.sourceforge.net/sourceforge/hplip/hplip-1.7.4a.tar.gz diff --git a/hplip.changes b/hplip.changes index f8446bd..44a055f 100644 --- a/hplip.changes +++ b/hplip.changes @@ -1,7 +1,13 @@ +------------------------------------------------------------------- +Thu Jun 21 15:46:12 CEST 2007 - jsmeix@suse.de + +- Added stop_on_removal to preun, insserv_cleanup to postun, + and ldconfig to post and postun for the hpijs sub-package. + ------------------------------------------------------------------- Thu May 24 01:46:16 CEST 2007 - ro@suse.de -- added libusb-devel to buildrequires +- Added libusb-devel to BuildRequires. ------------------------------------------------------------------- Fri Apr 27 14:28:27 CEST 2007 - jsmeix@suse.de @@ -79,7 +85,7 @@ Wed Jan 31 13:50:12 CET 2007 - jsmeix@suse.de Mon Jan 29 15:40:16 CET 2007 - jsmeix@suse.de - Package 'sane' was renamed to 'sane-backends'. - Adapted it so that it works with 'sane-backends' + Adapted it so that it works with 'sane-backends'. ------------------------------------------------------------------- Thu Jan 25 14:53:05 CET 2007 - jsmeix@suse.de diff --git a/hplip.spec b/hplip.spec index c897b22..342ada4 100644 --- a/hplip.spec +++ b/hplip.spec @@ -17,10 +17,10 @@ Summary: HP's Printing, Scanning, and Faxing Software # x.y.m : x = major release number, y = year (eg: 6 = 2006), m = month (eg: 6a = second release in June) # Official releases have a 3 digit number and release candidates have a 4 digit number: x.y.m.rc Version: 1.7.4a -Release: 18 +Release: 34 %define hpijsVersion 2.7.4 Group: Hardware/Printing -License: BSD License and BSD-like, GNU General Public License (GPL) +License: BSD License and BSD-like, GNU General Public License (GPL), In general all applications are covered by the GNU General Public License (GPL) and the backend is covered by a MIT license. The printer driver HPIJS uses a BSD license. See the COPYING file in the HPLIP tar ball for more details. URL: http://hpinkjet.sourceforge.net/ # Source0...Source9 is for sources from HP: # URL for Source0: http://switch.dl.sourceforge.net/sourceforge/hplip/hplip-1.7.4a.tar.gz @@ -97,7 +97,7 @@ Authors: Cauligi Raghothama S. %package hpijs -Summary: HPIJS for HP's printing and scanning software HPLIP. +Summary: HPIJS for HP's printing and scanning software HPLIP Group: Hardware/Printing # Mutual RPM package requirements are meanwhile considered to be bad because # such cyclic dependencies which makes it harder to automatically solve dependencies. @@ -268,6 +268,7 @@ fi exit 0 %preun +%stop_on_removal hplip # If the package was removed and if it was updated # remove all byte-compiled Python .pyc (and perhaps .pyo) files # which are created at run-time by Python in /usr/share/hplip/. @@ -282,6 +283,7 @@ exit 0 %postun /sbin/ldconfig +%insserv_cleanup # If the package was removed (but not if it was updated) # then remove the hpaio lines in /etc/sane.d/dll.conf. # Don't remove them when the hplip package was automatically @@ -301,6 +303,14 @@ then if ! ls /usr/lib*/sane/libsane-hpaio.so* &>/dev/null fi exit 0 +%post hpijs +/sbin/ldconfig +exit 0 + +%postun hpijs +/sbin/ldconfig +exit 0 + %files %defattr(-, root, root) %config %{_sysconfdir}/hp/ @@ -351,8 +361,11 @@ exit 0 %{_libdir}/libhpip.* %changelog +* Thu Jun 21 2007 - jsmeix@suse.de +- Added stop_on_removal to preun, insserv_cleanup to postun, + and ldconfig to post and postun for the hpijs sub-package. * Thu May 24 2007 - ro@suse.de -- added libusb-devel to buildrequires +- Added libusb-devel to BuildRequires. * Fri Apr 27 2007 - jsmeix@suse.de - Updated to version 1.7.4a: Resolved a build issue that caused a couple missing files @@ -403,7 +416,7 @@ exit 0 because fstack-protector will be enabled by default. * Mon Jan 29 2007 - jsmeix@suse.de - Package 'sane' was renamed to 'sane-backends'. - Adapted it so that it works with 'sane-backends' + Adapted it so that it works with 'sane-backends'. * Thu Jan 25 2007 - jsmeix@suse.de - Updated to version 1.7.1: Many bug fixes (no Suse bugs).