Tue Jul 31 16:51:48 UTC 2007

Author: davidz

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19139

Modified Files:
	.cvsignore hal.spec sources 
Removed Files:
	99-redhat-storage-policy-fixed-drives.fdi 
	hal-0.5.8.1-dont-crash-on-cdrom-drives.patch 
	hal-0.5.8.1-fedora-eject.patch hal-0.5.8.1-fixppc.patch 
	hal-0.5.8.1-partutil-fix.patch 
	hal-0.5.8.1-remove-link-not-remove.patch 
	hal-0.5.8.1-stat-devicefile-not-mountpoint.patch 
	hal-0.5.9-fixes.patch hal-alignment.patch 
	hal-device-manager.desktop 
Log Message:
* Tue Jul 31 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070731%{?dist}
- Update to RC1 git snapshot; include PolicyKit support
- Obsolete hal-gnome package as that is dropped upstream (eventually the
  functionality will be replaced by a gnome-device-manager package)
- Drop all patches as they are upstream
- Drop 99-redhat-storage-policy-fixed-drives.fdi; this is now
  controlled by PolicyKit
- Drop use of find_lang; upstream dropped all translations




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48

--- .cvsignore	3 Apr 2007 05:23:37 -0000	1.47
+++ .cvsignore	31 Jul 2007 16:51:12 -0000	1.48
@@ -40,3 +40,4 @@
 hal-0.5.9.git20070401.tar.gz
 hal-0.5.9.tar.gz
 hal-info-20070402.tar.gz
+hal-0.5.10rc1.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- hal.spec	31 Jul 2007 16:21:34 -0000	1.132
+++ hal.spec	31 Jul 2007 16:51:12 -0000	1.133
@@ -18,19 +18,17 @@
 %define gtk_doc_version         1.4
 %define consolekit_version      0.2.0
 %define acl_version             2.2.39
-
+%define policykit_version       0.5
+%define gperf_version           3.0.1
 
 %define hal_user_uid            68
 
 Summary: Hardware Abstraction Layer
 Name: hal
-Version: 0.5.9
-Release: 7%{?dist}
+Version: 0.5.10
+Release: 0.git20070731%{?dist}
 URL: http://www.freedesktop.org/Software/hal
-Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}.tar.gz
-Source1: 99-redhat-storage-policy-fixed-drives.fdi
-Source2: hal-device-manager.desktop
-Patch0: hal-0.5.9-fixes.patch
+Source0: http://people.freedesktop.org/~david/dist/%{name}-%{version}rc1.tar.gz
 
 License: AFL/GPL
 Group: System Environment/Libraries
@@ -49,7 +47,6 @@
 BuildRequires: gettext >= %{gettext_version}
 BuildRequires: dbus-glib >= %{dbus_glib_version}
 BuildRequires: perl(XML::Parser)
-BuildRequires: desktop-file-utils >= 0.9
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: libvolume_id-devel >= %{udev_version} 
 BuildRequires: pciutils-devel >= %{pciutils_version}
@@ -57,6 +54,8 @@
 %ifarch %{ix86} x86_64 ia64
 BuildRequires: libsmbios-devel
 %endif
+BuildRequires: PolicyKit-devel >= %{policykit_version}
+BuildRequires: gperf >= %{gperf_version}
 
 %ifnarch s390 s390x
 BuildRequires: libusb-devel >= %{libusb_version}
@@ -80,10 +79,12 @@
 Requires: dmidecode >= %{dmidecode_version}
 %endif
 Requires: ConsoleKit >= %{consolekit_version}
+Requires: PolicyKit >= %{policykit_version}
 Requires: acl >= %{acl_version}
 Requires: hal-libs = %{version}-%{release}
 Requires: hal-info
 Obsoletes: %{name} < 0.5.9-1
+Obsoletes: %{name}-gnome
 
 %description
 HAL is daemon for collection and maintaining information from several
@@ -98,18 +99,6 @@
 %description libs
 Libraries for accessing HAL.
 
-%package gnome
-Summary: GNOME based device manager for HAL
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: dbus-python >= %{dbus_python_version}
-Requires: pygtk2 >= %{pygtk2} 
-Requires: gnome-python2 >= %{gnome_python2} 
-
-%description gnome
-GNOME program for displaying the devices detected by HAL
-
-
 %package devel
 Summary: Libraries and headers for HAL
 Group: Development/Libraries
@@ -130,27 +119,19 @@
 
 %prep
 %setup -q
-%patch0 -p 1 -b .fixes
 
 %build
-%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
+%configure --enable-docbook-docs --docdir=%{_datadir}/doc/%{name}-%{version} --with-os-type=redhat --enable-console-kit --enable-policy-kit --enable-acl-management --enable-umount-helper --enable-acpi-ibm --enable-acpi-toshiba --with-eject=/usr/sbin/eject
+make
 
 %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 \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  %{SOURCE2}
-
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
 
-%find_lang hal
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -185,7 +166,7 @@
   /bin/cp -f fstab.replace /etc/fstab
 fi
 
-%files -f hal.lang
+%files
 %defattr(-,root,root,-)
 
 %doc %dir %{_datadir}/doc/%{name}-%{version}
@@ -205,15 +186,7 @@
 
 /sbin/umount.hal
 %{_sbindir}/hald
-%{_bindir}/hal-device
-%{_bindir}/hal-disable-polling
-%{_bindir}/hal-find-by-capability
-%{_bindir}/hal-find-by-property
-%{_bindir}/hal-get-property
-%{_bindir}/hal-is-caller-locked-out
-%{_bindir}/hal-lock
-%{_bindir}/hal-set-property
-%{_bindir}/lshal
+%{_bindir}/*
 
 %{_libexecdir}/*
 
@@ -229,6 +202,8 @@
 
 %{_sysconfdir}/udev/rules.d/90-hal.rules
 
+%{_datadir}/PolicyKit/policy/*
+
 %attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/cache/hald
 %attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/lib/hal
 
@@ -255,15 +230,19 @@
 %dir %{_datadir}/gtk-doc/html/libhal-storage
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
-%files gnome
-%defattr(-,root,root,-)
+%changelog
+* Tue Jul 31 2007 - David Zeuthen <davidz at redhat.com> - 0.5.10-0.git20070731%{?dist}
+- Update to RC1 git snapshot; include PolicyKit support
+- Obsolete hal-gnome package as that is dropped upstream (eventually the
+  functionality will be replaced by a gnome-device-manager package)
+- Drop all patches as they are upstream
+- Drop 99-redhat-storage-policy-fixed-drives.fdi; this is now
+  controlled by PolicyKit
+- Drop use of find_lang; upstream dropped all translations
 
-%dir %{_datadir}/hal/device-manager
-%{_datadir}/hal/device-manager/*
-%{_bindir}/hal-device-manager
-%{_datadir}/applications/*.desktop
+* Fri May 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.5.9-8
+- Really add libsmbios-devel to the BRs not the Requires
 
-%changelog
 * Fri May 18 2007 - Bastien Nocera <bnocera at redhat.com> - 0.5.9-7
 - Add libsmbios-devel to the BRs so we get Dell backlight support (#239225)
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/sources,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- sources	18 Apr 2007 01:36:47 -0000	1.49
+++ sources	31 Jul 2007 16:51:12 -0000	1.50
@@ -1 +1 @@
-a6f532770cf9286e1de38d6570cbc6bc  hal-0.5.9.tar.gz
+6478a4d8c6703c2272bd6f7b5f84a357  hal-0.5.10rc1.tar.gz


--- 99-redhat-storage-policy-fixed-drives.fdi DELETED ---


--- hal-0.5.8.1-dont-crash-on-cdrom-drives.patch DELETED ---


--- hal-0.5.8.1-fedora-eject.patch DELETED ---


--- hal-0.5.8.1-fixppc.patch DELETED ---


--- hal-0.5.8.1-partutil-fix.patch DELETED ---


--- hal-0.5.8.1-remove-link-not-remove.patch DELETED ---


--- hal-0.5.8.1-stat-devicefile-not-mountpoint.patch DELETED ---


--- hal-0.5.9-fixes.patch DELETED ---


--- hal-alignment.patch DELETED ---


--- hal-device-manager.desktop DELETED ---


