rpms/hplip/FC-5 hplip.spec,1.53,1.54

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hplip/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21482

Modified Files:
	hplip.spec 
Log Message:
* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 0.9.9-5.1
- Include hpfax.
- Always use /usr/lib/cups/backend for CUPS backend directory.
- Build requires libusb-devel.



Index: hplip.spec
===================================================================
RCS file: /cvs/dist/rpms/hplip/FC-5/hplip.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- hplip.spec	23 Mar 2006 17:24:47 -0000	1.53
+++ hplip.spec	24 Mar 2006 17:28:54 -0000	1.54
@@ -1,7 +1,7 @@
 Summary: HP Linux Imaging and Printing Project
 Name: hplip
 Version: 0.9.9
-Release: 5
+Release: 5.1
 License: GPL/MIT/BSD
 Group: System Environment/Daemons
 Conflicts: system-config-printer < 0.6.132
@@ -27,6 +27,7 @@
 BuildRequires: python-devel
 BuildRequires: libjpeg-devel
 BuildRequires: desktop-file-utils
+BuildRequires: libusb-devel
 
 %description
 The Hewlett-Packard Linux Imaging and Printing Project provides
@@ -105,14 +106,17 @@
 	--add-category Application				\
 	%{buildroot}%{_datadir}/hplip/data/hplip.desktop
 
+if [ ! -d %{buildroot}/usr/lib/cups/backend ]
+then
+  mkdir -p %{buildroot}/usr/lib/cups/backend
+  cp -a %{buildroot}/usr/lib{64,}/cups/backend/hp
+  cp -a %{buildroot}/usr/lib{64,}/cups/backend/hpfax
+fi
+
 # Move initscript
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d
 mv %{buildroot}%{_sysconfdir}/{init.d,rc.d/init.d}/hplip
 
-# Don't package hpfax yet.
-rm -f %{buildroot}%{_libdir}/cups/backend/hpfax
-rm -f %{buildroot}%{_datadir}/cups/model/HP-Fax*
-
 %clean
 rm -rf %{buildroot}
 
@@ -124,7 +128,12 @@
 %config(noreplace) %{_sysconfdir}/rc.d/init.d/hplip
 %{_bindir}/hp-*
 %{_sbindir}/hpiod
+%if "%{_libdir}" == "/usr/lib64"
 %{_libdir}/cups/backend/hp
+%{_libdir}/cups/backend/hpfax
+%endif
+/usr/lib/cups/backend/hp
+/usr/lib/cups/backend/hpfax
 %{_datadir}/hplip
 %{_libdir}/python*/site-packages/*
 %{_datadir}/applications/*.desktop
@@ -160,6 +169,11 @@
 fi
 
 %changelog
+* Fri Mar 24 2006 Tim Waugh <twaugh at redhat.com> 0.9.9-5.1
+- Include hpfax.
+- Always use /usr/lib/cups/backend for CUPS backend directory.
+- Build requires libusb-devel.
+
 * Thu Mar 23 2006 Tim Waugh <twaugh at redhat.com> 0.9.9-5
 - Rebuilt.