SPECS (DEVEL): hal.spec - install scripts in FHS compatibile locat...

[freetz]

Author: freetz                       Date: Wed Jan 18 20:57:38 2006 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- install scripts in FHS compatibile location, drop hal.hotplug, disable
  fstab-sync

---- Files affected:
SPECS:
   hal.spec (1.105.2.1 -> 1.105.2.2) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.105.2.1 SPECS/hal.spec:1.105.2.2
--- SPECS/hal.spec:1.105.2.1	Tue Jan 17 22:34:52 2006
+++ SPECS/hal.spec	Wed Jan 18 21:57:33 2006
@@ -2,7 +2,7 @@
 #
 # Conditional build:
 %bcond_without	docs		# disable documentation building
-%bcond_without	fstab_sync	# build with fstab-sync
+%bcond_with	fstab_sync	# build with fstab-sync
 #
 Summary:	HAL - Hardware Abstraction Layer
 Summary(pl):	HAL - abstrakcyjna warstwa dostępu do sprzętu
@@ -26,7 +26,7 @@
 URL:		http://freedesktop.org/Software/hal
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
-BuildRequires:	dbus-glib-devel >= 0.33
+BuildRequires:	dbus-glib-devel >= 0.60
 %if %{with docs}
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-dtd41-sgml
@@ -51,14 +51,13 @@
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
 Requires(post,preun):	/sbin/chkconfig
+%pyrequires_eq	python
 Requires:	%{name}-libs = %{version}-%{release}
 Requires:	dbus >= 0.33
+Requires:	dmidecode
 Requires:	glib2 >= 1:2.6.0
-Requires:	mount >= 2.12-14
-%pyrequires_eq	python
-Requires:	python-dbus >= 0.33
+Requires:	python-dbus >= 0.60
 Requires:	udev >= 1:071
-# Recommended:	dmidecode
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -163,7 +162,8 @@
 	--enable-selinux \
 	--with-hwdata=%{_sysconfdir} \
 	--with-pid-file=%{_localstatedir}/run/hald.pid
-%{__make}
+%{__make} \
+	scriptdir="%{_libdir}/hal/scripts"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -173,7 +173,8 @@
 	$RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	scriptdir="%{_libdir}/hal/scripts"
 
 install examples/volumed/*.py $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
@@ -237,8 +238,11 @@
 %dir %{_sysconfdir}/%{name}
 %{_sysconfdir}/%{name}/fdi
 
+%dir %{_libdir}/hal
+%dir %{_libdir}/hal/scripts
+%attr(755,root,root) %{_libdir}/hal/scripts/hal-*
+
 %attr(754,root,root) /etc/rc.d/init.d/*
-%attr(755,root,root) %{_libdir}/hal.hotplug
 %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/hal.rules
@@ -285,6 +289,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105.2.2  2006/01/18 20:57:33  freetz
+- install scripts in FHS compatibile location, drop hal.hotplug, disable
+  fstab-sync
+
 Revision 1.105.2.1  2006/01/17 21:34:52  patrys
 - up to 0.5.6
 - NFY - fstab-sync tries to access /etc
================================================================

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