SPECS: hal.spec - post merge cleanup

[freetz]

Author: freetz                       Date: Sat Apr  1 14:02:44 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- post merge cleanup

---- Files affected:
SPECS:
   hal.spec (1.107 -> 1.108) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.107 SPECS/hal.spec:1.108
--- SPECS/hal.spec:1.107	Sat Apr  1 15:55:33 2006
+++ SPECS/hal.spec	Sat Apr  1 16:02:39 2006
@@ -179,10 +179,6 @@
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/haldaemon
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/hald
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}
-<<<<<<< hal.spec
-sed -e 's|lib|%{_lib}|' %{SOURCE4} > $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/hal.rules
-=======
->>>>>>> 1.105.2.14
 
 # hal-gphoto
 install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/fdi/information/10freedesktop/10-gphoto.fdi
@@ -293,6 +289,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.108  2006/04/01 14:02:39  freetz
+- post merge cleanup
+
 Revision 1.107  2006/04/01 13:55:33  freetz
 - merged from DEVEL
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/hal.spec?r1=1.107&r2=1.108&f=u