rpms/hal/devel .cvsignore, 1.46, 1.47 hal.spec, 1.124, 1.125 sources, 1.47, 1.48

[fedora-cvs-commits at redhat.com]

Author: davidz

Update of /cvs/dist/rpms/hal/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19880

Modified Files:
	.cvsignore hal.spec sources 
Log Message:
* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-1
- Update to upstream release 0.5.9 and hal-info 20070402




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/.cvsignore,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- .cvsignore	1 Apr 2007 19:37:06 -0000	1.46
+++ .cvsignore	3 Apr 2007 05:23:37 -0000	1.47
@@ -38,3 +38,5 @@
 hal-0.5.9.git20070326.tar.gz
 hal-info-20070328.tar.gz
 hal-0.5.9.git20070401.tar.gz
+hal-0.5.9.tar.gz
+hal-info-20070402.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/hal.spec,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- hal.spec	3 Apr 2007 01:24:33 -0000	1.124
+++ hal.spec	3 Apr 2007 05:23:37 -0000	1.125
@@ -16,19 +16,19 @@
 %define cryptsetup_luks_version 1.0.1-2
 %define pm_utils_version        0.10-1
 %define gtk_doc_version         1.4
-%define consolekit_version      0.1.0
+%define consolekit_version      0.2.0
 %define acl_version             2.2.39
 
 %define hal_user_uid            68
 
-%define hal_info_version        20070328
+%define hal_info_version        20070402
 
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.9
-Release: 0.git20070401.2%{?dist}
+Release: 1%{?dist}
 URL: http://www.freedesktop.org/Software/hal
-Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.git20070401.tar.gz
+Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
 Source1: 99-redhat-storage-policy-fixed-drives.fdi
 Source2: hal-device-manager.desktop
 Source3: http://people.freedesktop.org/~david/dist/hal-info-%{hal_info_version}.tar.gz
@@ -118,7 +118,7 @@
 %package docs
 Summary: Documentation for HAL
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 
 %description docs
 API docs for HAL.
@@ -127,7 +127,7 @@
 %setup -q -a 3
 
 %build
-%configure --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-docbook-docs --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
+%configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
 
 cd hal-info-%{hal_info_version}
 %configure
@@ -135,6 +135,8 @@
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 
+cp README AUTHORS NEWS COPYING HACKING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
+
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor/
 
 desktop-file-install --vendor fedora \
@@ -149,9 +151,6 @@
 cd hal-info-%{hal_info_version}
 make install DESTDIR=$RPM_BUILD_ROOT
 
-cp NEWS $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-cp COPYING $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -192,6 +191,9 @@
 %doc %dir %{_datadir}/doc/%{name}-%{version}
 %doc %{_datadir}/doc/%{name}-%{version}/NEWS
 %doc %{_datadir}/doc/%{name}-%{version}/COPYING
+%doc %{_datadir}/doc/%{name}-%{version}/AUTHORS
+%doc %{_datadir}/doc/%{name}-%{version}/HACKING
+%doc %{_datadir}/doc/%{name}-%{version}/README
 
 %dir %{_sysconfdir}/dbus-1/system.d
 %config %{_sysconfdir}/dbus-1/system.d/hal.conf
@@ -223,6 +225,7 @@
 %dir %{_libdir}/hal/scripts
 %{_libdir}/hal/scripts/*
 %{_mandir}/man1/*
+%{_mandir}/man8/*
 
 %{_sysconfdir}/udev/rules.d/90-hal.rules
 
@@ -261,6 +264,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-1
+- Update to upstream release 0.5.9 and hal-info 20070402
+
 * Mon Apr 02 2007 David Zeuthen <davidz at redhat.com> - 0.5.9-0.git20070401.2
 - Split hal package into hal and hal-libs (#231200)
 - Fix hal-device-manager ownership (#234696)


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/hal/devel/sources,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- sources	1 Apr 2007 19:37:06 -0000	1.47
+++ sources	3 Apr 2007 05:23:37 -0000	1.48
@@ -1,2 +1,2 @@
-7c5ddf3fe462b225f7c0be69843631c7  hal-info-20070328.tar.gz
-53a0a42f66b13db93757db923f8d720c  hal-0.5.9.git20070401.tar.gz
+a6f532770cf9286e1de38d6570cbc6bc  hal-0.5.9.tar.gz
+21dbda966482245c42c0356e087417dd  hal-info-20070402.tar.gz