rpms/hal-cups-utils/FC-5 hal-cups-utils.spec,1.25,1.26

[fedora-cvs-commits at redhat.com]

Author: twaugh

Update of /cvs/dist/rpms/hal-cups-utils/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv7358

Modified Files:
	hal-cups-utils.spec 
Log Message:
* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> - 0.5.5-1.2.fc5.2
- hal backend lives in both /usr/lib and /usr/lib64 on 64bit architectures
  for FC5.



Index: hal-cups-utils.spec
===================================================================
RCS file: /cvs/dist/rpms/hal-cups-utils/FC-5/hal-cups-utils.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- hal-cups-utils.spec	28 Mar 2006 17:33:09 -0000	1.25
+++ hal-cups-utils.spec	4 Apr 2006 17:20:10 -0000	1.26
@@ -1,7 +1,7 @@
 Summary: Halified CUPS utilities 
 Name: hal-cups-utils
 Version: 0.5.5
-Release: 1.2.fc5.1
+Release: 1.2.fc5.2
 License: GPL
 Group: Applications/System
 Source: %{name}-%{version}.tar.gz
@@ -39,7 +39,7 @@
 
 if [ -n "`echo %{_libdir} | grep lib64`" ] ; then
   mkdir -p $RPM_BUILD_ROOT/usr/lib/cups/backend
-    mv $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/
+    cp -a $RPM_BUILD_ROOT/usr/lib64/cups/backend/* $RPM_BUILD_ROOT/usr/lib/cups/backend/
 
 fi
     
@@ -72,11 +72,18 @@
 %{_bindir}/cups-config-daemon
 %{_sbindir}/hal_lpadmin
 /usr/lib/cups/backend/hal
+%if "%_libdir" == "/usr/lib64"
+%{_libdir}/cups/backend/hal
+%endif
 %{_datadir}/hal/fdi/policy/10osvendor/10-hal_lpadmin.fdi
 %{_sysconfdir}/dbus-1/system.d/cups-config-daemon-dbus.conf
 %{_sysconfdir}/rc.d/init.d/cups-config-daemon
 
 %changelog
+* Tue Apr  4 2006 Tim Waugh <twaugh at redhat.com> - 0.5.5-1.2.fc5.2
+- hal backend lives in both /usr/lib and /usr/lib64 on 64bit architectures
+  for FC5.
+
 * Tue Mar 28 2006 John (J5) Palmieri <johnp at redhat.com> - 0.5.5-1.2.fc5.1
 - Move the hal backend to /usr/lib on 64bit arch's