SPECS (AC-branch): hal.spec - merged from HEAD

baggins baggins at pld-linux.org
Mon May 15 00:34:46 CEST 2006 

Author: baggins                      Date: Sun May 14 22:34:46 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   hal.spec (1.105.4.2 -> 1.105.4.3) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.105.4.2 SPECS/hal.spec:1.105.4.3
--- SPECS/hal.spec:1.105.4.2	Mon Apr 24 01:00:34 2006
+++ SPECS/hal.spec	Mon May 15 00:34:36 2006
@@ -2,31 +2,29 @@
 #
 # Conditional build:
 %bcond_without	docs		# disable documentation building
-%bcond_without	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.5.1
-Release:	5
+Version:	0.5.7
+Release:	1
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
-# Source0-md5:	2abd81ed3f5a37789f4fbda2f6a61270
+# Source0-md5:	4163afb8285db64e00e7b1392b401d92
 Source1:	%{name}daemon.init
 Source2:	%{name}d.sysconfig
 Source3:	%{name}-device-manager.desktop
-Source4:	%{name}.rules
-Source5:	%{name}-libgphoto2.fdi
-Source6:	%{name}-libgphoto_udev.rules
+Source4:	%{name}-libgphoto2.fdi
+Source5:	%{name}-libgphoto_udev.rules
+Source6:	%{name}-storage-policy-fixed-drives.fdi
 Patch0:		%{name}-device_manager.patch
-Patch1:		%{name}-link.patch
-Patch2:		%{name}-pld_policy.patch
-Patch3:		%{name}-pld_powersave.patch
+Patch1:		%{name}-script_path.patch
+Patch2:		%{name}-tools.patch
 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 +49,14 @@
 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:	dbus >= 0.60-4
+Requires:	dmidecode
 Requires:	glib2 >= 1:2.6.0
-Requires:	mount >= 2.12-14
-%pyrequires_eq	python
-Requires:	python-dbus >= 0.33
-Requires:	udev >= 1:071
-# Recommended:	dmidecode
+Requires:	python-dbus >= 0.60
+Requires:	udev >= 1:079-2
+Obsoletes:	hal-fstab-sync
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -143,7 +141,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__glib_gettextize}
@@ -158,7 +155,7 @@
 	%{!?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} \
@@ -182,13 +179,17 @@
 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}
-sed -e 's,/lib/,/%{_lib}/,' %{SOURCE4} > $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/hal.rules
 
 # hal-gphoto
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/%{name}/fdi/information/10freedesktop/10-gphoto.fdi
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/gphoto.rules
+install %{SOURCE4} $RPM_BUILD_ROOT%{_datadir}/%{name}/fdi/information/10freedesktop/10-gphoto.fdi
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/gphoto.rules
+
+# policy file to ignore fixed disks.
+install %{SOURCE6} \
+	$RPM_BUILD_ROOT%{_datadir}/%{name}/fdi/policy/10osvendor/99-storage-policy-fixed-drives.fdi
 
 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}
@@ -232,20 +233,23 @@
 %attr(755,root,root) %{_bindir}/hal-get-property
 %attr(755,root,root) %{_bindir}/hal-set-property
 %attr(755,root,root) %{_bindir}/lshal
+%attr(755,root,root) %{_sbindir}/hald
 %attr(755,root,root) %{_libdir}/hald-*
-%attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_libexecdir}/hal-*
+%dir %{_libdir}/hal
+%dir %{_libdir}/hal/scripts
+%attr(755,root,root) %{_libdir}/hal/scripts/*
+
 %dir %{_sysconfdir}/%{name}
 %{_sysconfdir}/%{name}/fdi
 
 %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
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/udev/rules.d/*
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/fdi
-%{?with_fstab_sync:%{_mandir}/man8/fstab-sync.8*}
 
 %files libs
 %defattr(644,root,root,755)
@@ -272,7 +276,6 @@
 %{_datadir}/%{name}/device-manager/*.py[co]
 %{_datadir}/%{name}/device-manager/*.png
 %{_datadir}/%{name}/device-manager/*.glade
-%attr(755,root,root) %{_datadir}/%{name}/device-manager/hal-device-manager
 %{_desktopdir}/*.desktop
 
 %files gphoto
@@ -286,11 +289,68 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.105.4.3  2006/05/14 22:34:36  baggins
+- merged from HEAD
+
 Revision 1.105.4.2  2006/04/23 23:00:34  glen
 - lib64 fix, rel 5
 
 Revision 1.105.4.1  2006/04/14 15:03:54  glen
 - rel 4
+
+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
+
+Revision 1.105.2.14  2006/03/13 13:48:12  freetz
+- added tools patch, rel.1
+
+Revision 1.105.2.13  2006/02/26 22:27:42  freetz
+- removed invalid typo patch
+
+Revision 1.105.2.12  2006/02/26 17:39:21  freetz
+- fix a typo in storage policy (patch added)
+
+Revision 1.105.2.11  2006/02/24 13:21:07  freetz
+- started work on 0.5.7, removed obsoleted patches/sources, dropped
+  fstab-sync (removed upstream)
+
+Revision 1.105.2.10  2006/02/23 17:34:17  freetz
+- fixed breakage introduces in my last commit, dropped storage-methods
+  rel.6
+
+Revision 1.105.2.9  2006/02/19 21:12:51  freetz
+- rel.6, require fixed dbus, unify udev requirement
+
+Revision 1.105.2.8  2006/02/19 15:19:31  freetz
+- added fixed drives storage policy file
+
+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
+
+Revision 1.105.2.5  2006/02/13 14:05:01  freetz
+- added eject_audiocd.patch, rel.3
+
+Revision 1.105.2.4  2006/02/02 22:35:39  freetz
+- place scripts in sbindir
+
+Revision 1.105.2.3  2006/02/02 17:24:24  freetz
+- rel.2 (fixed init scripts)
+
+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
+Revision 1.106  2006/02/05 11:45:29  freetz
+- fixed hal udev rule on amd64, rel.4
 
 Revision 1.105  2006/01/12 22:05:18  freetz
 - rel.3
================================================================

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

More information about the pld-cvs-commit mailing list