SPECS: hal.spec - added parted patch to kill -luuid from libhal li...

[qboosh]

Author: qboosh                       Date: Thu May 24 17:41:41 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added parted patch to kill -luuid from libhal linking and allow parted 1.8.7
- removed duplicate of gphoto rules from base package

---- Files affected:
SPECS:
   hal.spec (1.134 -> 1.135) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.134 SPECS/hal.spec:1.135
--- SPECS/hal.spec:1.134	Thu May 24 19:29:13 2007
+++ SPECS/hal.spec	Thu May 24 19:41:36 2007
@@ -1,4 +1,5 @@
 # $Revision$, $Date$
+# TODO: move -gphoto to hal-gphoto.spec? (it's fully independent)
 #
 # Conditional build:
 %bcond_without	doc		# disable documentation building
@@ -20,6 +21,7 @@
 Source6:	%{name}-storage-policy-fixed-drives.fdi
 Patch0:		%{name}-device_manager.patch
 Patch1:		%{name}-tools.patch
+Patch2:		%{name}-parted.patch
 URL:		http://freedesktop.org/Software/hal
 #BuildRequires:	ConsoleKit-devel
 BuildRequires:	PolicyKit-devel >= 0.2
@@ -161,6 +163,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__glib_gettextize}
@@ -270,10 +273,9 @@
 
 %attr(754,root,root) /etc/rc.d/init.d/*
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hald
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus*/system.d/*
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/*
-
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PolicyKit/privilege.d/*
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus*/system.d/hal.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/90-hal.rules
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/PolicyKit/privilege.d/hal-*.privilege
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/fdi
@@ -288,18 +290,22 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so.*.*.*
+%attr(755,root,root) %{_libdir}/libhal.so.*.*.*
+%attr(755,root,root) %{_libdir}/libhal-storage.so.*.*.*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libhal.so
+%attr(755,root,root) %{_libdir}/libhal-storage.so
+%{_libdir}/libhal.la
+%{_libdir}/libhal-storage.la
 %{_includedir}/%{name}
 %{_pkgconfigdir}/*.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libhal.a
+%{_libdir}/libhal-storage.a
 
 %files apidocs
 %defattr(644,root,root,755)
@@ -326,6 +332,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.135  2007/05/24 17:41:36  qboosh
+- added parted patch to kill -luuid from libhal linking and allow parted 1.8.7
+- removed duplicate of gphoto rules from base package
+
 Revision 1.134  2007/05/24 17:29:13  qboosh
 - hal-samsung_yp_z5 patch belongs to hal-info now (but needs update)
 
================================================================

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