SPECS: hal.spec - merged from DEVEL and updated to final 0.5.4 - c...

[paladine]

Author: paladine                     Date: Sat Aug 27 21:31:01 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL and updated to final 0.5.4
- changed and uncommented pld_policy patch
- sorted %%configure options
- dropped fstab-sync support again (back to pmount)

---- Files affected:
SPECS:
   hal.spec (1.82 -> 1.83) 

---- Diffs:

================================================================
Index: SPECS/hal.spec
diff -u SPECS/hal.spec:1.82 SPECS/hal.spec:1.83
--- SPECS/hal.spec:1.82	Wed Aug 24 13:02:29 2005
+++ SPECS/hal.spec	Sat Aug 27 23:30:56 2005
@@ -1,17 +1,18 @@
 # $Revision$, $Date$
 #
 # Conditional build:
-%bcond_without	docs	# disable documentation building
+%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.3
-Release:	3
+Version:	0.5.4
+Release:	0.1
 License:	AFL v2.0 or GPL v2
 Group:		Libraries
 Source0:	http://freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
-# Source0-md5:	bc4005ef21c7c8bfe3444cf0f3fa6d68
+# Source0-md5:	2f84ddbc22bc35baa9388e7794d1fa31
 Source1:	%{name}daemon.init
 Source2:	%{name}d.sysconfig
 Source3:	%{name}-device-manager.desktop
@@ -100,8 +101,8 @@
 Summary(pl):	Zarządca urządzeń HALa dla GNOME
 Group:		X11/Applications
 Requires:	python-gnome-ui
-Requires:	python-pygtk-glade
 Requires:	python-gnome-vfs
+Requires:	python-pygtk-glade
 Requires:	%{name} = %{version}-%{release}
 
 %description device-manager
@@ -114,9 +115,11 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-#%patch2 -p1
+%patch2 -p1
 
 %build
+%{__glib_gettextize}
+%{__intltoolize}
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -124,19 +127,21 @@
 %{__automake}
 %configure \
 	%{?with_docs:--enable-docbook-docs} \
+	%{!?with_docs:--disable-docbook-docs} \
 	%{?with_docs:--enable-doxygen-docs} \
+	%{!?with_docs:--disable-doxygen-docs} \
+	%{?with_fstab_sync:--enable-fstab-sync} \
 	--enable-pcmcia-support \
 	--enable-selinux \
-	--with-hwdata=%{_sysconfdir} \
-	--enable-fstab-sync \
 	--enable-verbose-mode \
+	--with-hwdata=%{_sysconfdir} \
 	--with-pid-file=%{_localstatedir}/run/hald.pid
 %{__make}
 
 %install
 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/{sysconfig,rc.d}/init.d,%{_desktopdir}} \
 	$RPM_BUILD_ROOT/etc/hal/fdi/{information,policy,preprobe}
 
 %{__make} install \
@@ -182,13 +187,10 @@
 %attr(755,root,root) %{_bindir}/hal-set-property
 %attr(755,root,root) %{_bindir}/lshal
 %attr(755,root,root) %{_libdir}/hald-*
-%{_mandir}/man8/fstab-sync.8*
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_sysconfdir}/%{name}
-
 %{_sysconfdir}/%{name}/fdi
 %{_sysconfdir}/hotplug.d/default/*
-
 %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
@@ -196,7 +198,8 @@
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/fdi
-%dir /var/run/hald
+%{?with_fstab_sync:%{_mandir}/man8/fstab-sync.8*}
+%{_examplesdir}/%{name}-%{version}
 
 %files libs
 %defattr(644,root,root,755)
@@ -231,6 +234,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.83  2005/08/27 21:30:56  paladine
+- merged from DEVEL and updated to final 0.5.4
+- changed and uncommented pld_policy patch
+- sorted %%configure options
+- dropped fstab-sync support again (back to pmount)
+
 Revision 1.82  2005/08/24 11:02:29  paladine
 - changed pid file
 - commentedout pld_policy patch
@@ -255,6 +264,19 @@
 - 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.2.4  2005/08/27 08:07:45  aredridel
+- prevent docs building with --without docs
+
+Revision 1.75.2.3  2005/08/03 17:29:36  wiget
+- don't duplicate %{_datadir}/%{name}/device-manger
+
+Revision 1.75.2.2  2005/08/03 10:26:38  freetz
+- cosmetics
+
+Revision 1.75.2.1  2005/08/02 22:08:47  freetz
+- for brave ones: 0.5.4 20050801 snap, fstab-sync bconded (we don't need it
+  anymore - obsoleted by pmount), more pldize macros
 
 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.82&r2=1.83&f=u