SPECS: hal.spec - dropped fstab-sync support (we got pmount now), ...

freetz freetz at pld-linux.org
Thu Aug 4 19:23:36 CEST 2005


Author: freetz                       Date: Thu Aug  4 17:23:36 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped fstab-sync support (we got pmount now), fixed %%files, added
  missing hal.hotplug symlink (yeah, it works now like a charm), cleanup,
  dropped mount-options patch (not needed anymore), rel.1

---- Files affected:
SPECS:
   hal.spec (1.75 -> 1.76) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.75 SPECS/hal.spec:1.76
--- SPECS/hal.spec:1.75	Tue Aug  2 17:54:12 2005
+++ SPECS/hal.spec	Thu Aug  4 19:23:30 2005
@@ -7,7 +7,7 @@
 Summary(pl):	HAL - abstrakcyjna warstwa dostępu do sprzętu
 Name:		hal
 Version:	0.5.3
-Release:	0.1
+Release:	1
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
@@ -16,8 +16,7 @@
 Source2:	%{name}d.sysconfig
 Source3:	%{name}-device-manager.desktop
 Patch0:		%{name}-device_manager.patch
-Patch1:		%{name}-mount-options.patch
-Patch2:		%{name}-link.patch
+Patch1:		%{name}-link.patch
 URL:		http://freedesktop.org/Software/hal
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
@@ -49,8 +48,7 @@
 Requires:	mount >= 2.12-14
 %pyrequires_eq	python
 Requires:	python-dbus >= 0.33
-Requires:	udev >= 051
-Requires:	udev <= 058
+Requires:	udev >= 057
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -115,7 +113,6 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -126,7 +123,6 @@
 %configure \
 	%{?with_docs:--enable-docbook-docs} \
 	%{?with_docs:--enable-doxygen-docs} \
-	--enable-fstab-sync \
 	--enable-pcmcia-support \
 	--enable-selinux \
 	--with-hwdata=%{_sysconfdir}
@@ -137,7 +133,7 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} \
 	$RPM_BUILD_ROOT{/etc/{sysconfig,rc.d}/init.d,%{_desktopdir},/var/run/hald} \
-	$RPM_BUILD_ROOT{/etc/hal/fdi/{information,policy,preprobe}}
+	$RPM_BUILD_ROOT/etc/hal/fdi/{information,policy,preprobe}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
@@ -184,16 +180,17 @@
 %attr(755,root,root) %{_libdir}/hald-*
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_sysconfdir}/%{name}
+
 %{_sysconfdir}/%{name}/fdi
+%{_sysconfdir}/hotplug.d/default/*
+
 %attr(754,root,root) /etc/rc.d/init.d/*
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/hald
 %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/*
 
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}
-%{_mandir}/man8/fstab-sync.8*
-%{_examplesdir}/%{name}-%{version}
+%{_datadir}/%{name}/fdi
 %dir /var/run/hald
 
 %files libs
@@ -204,6 +201,8 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
+%dir %{_examplesdir}/%{name}-%{version}
+%attr(755,root,root) %{_examplesdir}/%{name}-%{version}/*.py
 %{_includedir}/%{name}
 %{_pkgconfigdir}/*.pc
 
@@ -227,6 +226,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.76  2005/08/04 17:23:30  freetz
+- dropped fstab-sync support (we got pmount now), fixed %%files, added
+  missing hal.hotplug symlink (yeah, it works now like a charm), cleanup,
+  dropped mount-options patch (not needed anymore), rel.1
+
 Revision 1.75  2005/08/02 15:54:12  saq
 - reqs from NEWS
 
================================================================

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




More information about the pld-cvs-commit mailing list