SPECS (DEVEL): hal.spec - provide virtual storage-methods package, ...

[freetz]

Author: freetz                       Date: Sat Feb 18 22:21:59 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- provide virtual storage-methods package, small cleanup

---- Files affected:
SPECS:
   hal.spec (1.105.2.6 -> 1.105.2.7) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.105.2.6 SPECS/hal.spec:1.105.2.7
--- SPECS/hal.spec:1.105.2.6	Sat Feb 18 19:15:36 2006
+++ SPECS/hal.spec	Sat Feb 18 23:21:53 2006
@@ -2,13 +2,12 @@
 #
 # Conditional build:
 %bcond_without	docs		# disable documentation building
-%bcond_with	fstab_sync	# build with fstab-sync
 #
 Summary:	HAL - Hardware Abstraction Layer
 Summary(pl):	HAL - abstrakcyjna warstwa dostępu do sprzętu
 Name:		hal
 Version:	0.5.6
-Release:	5
+Release:	5.1
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
@@ -120,6 +119,22 @@
 %description device-manager -l pl
 Program dla GNOME wyświetlający urządzenia wykryte przez HAL.
 
+%package fstab-sync
+Summary:	File system table manager
+Summary(pl):	Zarządca tabeli systemu plików
+Group:		Applications
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	gnome-mount
+Provides:	storage-methods
+
+%description fstab-sync
+Update the /etc/fstab file and and create/remove mount points in /media
+in response to HAL events.
+
+%description fstab-sync -l pl
+Zmienia zawartość pliku /etc/fstab i tworzy/usuwa punkty mountowania
+w odpowiedzi na zdarzenia generowane przez HAL.
+
 %package gphoto
 Summary:	Userspace support for digital cameras
 Summary(pl):	Wsparcie dla kamer cyfrowych w przestrzeni użytkownika
@@ -161,13 +176,12 @@
 	%{!?with_docs:--disable-docbook-docs} \
 	%{?with_docs:--enable-doxygen-docs} \
 	%{!?with_docs:--disable-doxygen-docs} \
-	%{?with_fstab_sync:--enable-fstab-sync} \
+	--enable-fstab-sync \
 	--enable-pcmcia-support \
 	--enable-selinux \
 	--with-hwdata=%{_sysconfdir} \
 	--with-pid-file=%{_localstatedir}/run/hald.pid
-%{__make} \
-	scriptdir="%{_sbindir}"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -177,8 +191,7 @@
 	$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	scriptdir="%{_sbindir}"
+	DESTDIR=$RPM_BUILD_ROOT
 
 install examples/volumed/*.py $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -194,6 +207,7 @@
 install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/gphoto.rules
 
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/hotplug.d
+rm -rf $RPM_BUILD_ROOT%{_libdir}/hal.hotplug
 mv -f $RPM_BUILD_ROOT%{_datadir}/locale/sl{_SI,}
 
 %find_lang %{name}
@@ -228,6 +242,12 @@
 
 EOF
 
+%post fstab-sync
+%service haldaemon restart
+
+%postun fstab-sync
+%service haldaemon restart
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README doc/TODO
@@ -238,7 +258,10 @@
 %attr(755,root,root) %{_bindir}/hal-set-property
 %attr(755,root,root) %{_bindir}/lshal
 %attr(755,root,root) %{_libdir}/hald-*
-%attr(755,root,root) %{_sbindir}/*
+%dir %{_libdir}/hal
+%dir %{_libdir}/hal/scripts
+%attr(755,root,root) %{_libdir}/hal/scripts/*
+
 %dir %{_sysconfdir}/%{name}
 %{_sysconfdir}/%{name}/fdi
 
@@ -249,7 +272,6 @@
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/fdi
-%{?with_fstab_sync:%{_mandir}/man8/fstab-sync.8*}
 
 %files libs
 %defattr(644,root,root,755)
@@ -278,6 +300,11 @@
 %{_datadir}/%{name}/device-manager/*.glade
 %{_desktopdir}/*.desktop
 
+%files fstab-sync
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/*
+%{_mandir}/man8/fstab-sync.8*
+
 %files gphoto
 %defattr(644,root,root,755)
 %{_sysconfdir}/udev/rules.d/gphoto.rules
@@ -289,6 +316,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105.2.7  2006/02/18 22:21:53  freetz
+- provide virtual storage-methods package, small cleanup
+
 Revision 1.105.2.6  2006/02/18 18:15:36  freetz
 - fixed https://bugs.freedesktop.org/show_bug.cgi?id=5655 rel.5
 
================================================================

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