OBS User unknown 2007-01-29 15:58:21 +00:00 committed by Git OBS Bridge
parent 595598df3a
commit e590bd57e8
2 changed files with 16 additions and 7 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
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'
-------------------------------------------------------------------
Thu Jan 25 14:53:05 CET 2007 - jsmeix@suse.de

View File

@ -11,13 +11,13 @@
# norootforbuild
Name: hplip
BuildRequires: cups cups-devel libdrm-devel libjpeg-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt python-tk python-xml qt3-devel readline-devel sane update-desktop-files
BuildRequires: cups cups-devel libdrm-devel libjpeg-devel net-snmp-devel pkgconfig python-devel python-openssl python-qt python-tk python-xml qt3-devel readline-devel sane-backends update-desktop-files
Summary: HP's Printing and Scanning Software
# HPLIP has reached 1.0 status. With this release a date encoded revision number is used:
# 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.1
Release: 1
Release: 2
%define hpijsVersion 2.7.1
Group: Hardware/Printing
License: BSD License and BSD-like, GNU General Public License (GPL)
@ -178,7 +178,7 @@ make install DESTDIR=%{buildroot}
# Install the special hpijs which does not require the CUPS library:
install -m 755 prnt/hpijs/hpijs.without-libcups %{buildroot}%{_bindir}
# Remove the installed /etc/sane.d/dll.conf
# because this is provided by the sane package:
# because this is provided by the sane-backends package:
rm %{buildroot}%{_sysconfdir}/sane.d/dll.conf
# Move /usr/lib/libsane-hpaio.* to where SANE expects them:
mv -f %{buildroot}%{_libdir}/libsane-hpaio.* %{buildroot}%{_libdir}/sane/
@ -249,9 +249,9 @@ install -m 644 %{SOURCE102} %{buildroot}%{_mandir}/man1/
/sbin/ldconfig
exit 0
%triggerin -- sane
# As hplip can be used for plain printers it cannot "PreReq sane".
# Therefore if sane is installed it may be installed or updated after hplip.
%triggerin -- sane-backends
# As hplip can be used for plain printers it cannot "PreReq sane-backends".
# Therefore if sane-backends is installed it may be installed or updated after hplip.
# In this case trigger to add the SANE backend "hpaio" to /etc/sane.d/dll.conf if it is not there.
# To be safe there is a test that /etc/sane.d/dll.conf is writable.
if [ -w /etc/sane.d/dll.conf ]
@ -265,7 +265,7 @@ exit 0
# then remove the hpaio lines in /etc/sane.d/dll.conf.
# The "exit 0" is necessary, otherwise the postun script
# would exit with non-zero exit-code if the package was not removed.
# Note that sane may not be installed (see triggerin)
# Note that sane-backends may not be installed (see triggerin)
# and therefore the test that /etc/sane.d/dll.conf is writable.
if [ "$1" = "0" ]
then [ -w /etc/sane.d/dll.conf ] && sed -i -e '/hpaio/d' /etc/sane.d/dll.conf
@ -322,6 +322,9 @@ exit 0
%{_libdir}/libhpip.*
%changelog -n hplip
* Mon Jan 29 2007 - jsmeix@suse.de
- Package 'sane' was renamed to '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).