rpms/hal/devel hal.spec, 1.199, 1.200 blkid.patch, 1.1, NONE hal-0.5.10-set-property-direct.patch, 1.1, NONE hal-add-keys-to-buttons.patch, 1.1, NONE hal-tablet-evdev.patch, 1.1, NONE

[Richard Hughes]

Author: rhughes

Update of /cvs/pkgs/rpms/hal/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5169

Modified Files:
	hal.spec 
Removed Files:
	blkid.patch hal-0.5.10-set-property-direct.patch 
	hal-add-keys-to-buttons.patch hal-tablet-evdev.patch 
Log Message:
* Tue Jul 28 2009 Richard Hughes <rhughes at redhat.com> - 0.5.13-2
- Drop upstreamed patches to fix build



Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -p -r1.199 -r1.200
--- hal.spec	27 Jul 2009 16:45:47 -0000	1.199
+++ hal.spec	28 Jul 2009 10:57:40 -0000	1.200
@@ -26,7 +26,7 @@
 Summary: Hardware Abstraction Layer
 Name: hal
 Version: 0.5.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 #Release: 1.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}.tar.gz
@@ -35,20 +35,14 @@ Source0: http://hal.freedesktop.org/rele
 # OLPC specific, not upstream as is a hack until OFW lands
 Source1: 05-olpc-detect.fdi
 
-Patch1: hal-0.5.10-set-property-direct.patch
 Patch2: hal-change-priority.patch
-Patch3: hal-add-keys-to-buttons.patch
 
 # https://bugzilla.redhat.com/show_bug.cgi?id=488177
 Patch4: hal-remove-dell-killswitch.patch
 
-Patch7: hal-tablet-evdev.patch
-
 # http://lists.freedesktop.org/archives/hal/2009-March/013125.html
 Patch9: hal-KVM-evdev.patch
 
-# from upstream
-Patch10: blkid.patch
 # http://bugs.freedesktop.org/show_bug.cgi?id=22442
 Patch11: hal-HDAPS-blacklist.patch
 
@@ -139,13 +133,9 @@ API docs for HAL.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch1 -p1 -b .direct
 %patch2 -p1 -b .priority
-%patch3 -p1 -b .keys
 %patch4 -p1 -b .dell-killswitch
-%patch7 -p1 -b .tablet-evdev
 %patch9 -p1 -b .kvm-evdev
-%patch10 -p1 -b .blkid
 %patch11 -p1 -b .hdaps-blacklist
 %patch100 -p1 -b .drop-polkit
 
@@ -287,9 +277,11 @@ fi
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Tue Jul 28 2009 Richard Hughes <rhughes at redhat.com> - 0.5.13-2
+- Drop upstreamed patches to fix build
+
 * Mon Jul 27 2009 Richard Hughes <rhughes at redhat.com> - 0.5.13-1
 - Use the release tarball, we did have a release against all the odds.
-- Drop upstreamed patches
 
 * Sat Jul 25 2009 Peter Hutterer <peter.hutterer at redhat.com> - 0.5.12-28.20090226git.4
 - hal-HDAPS-blacklist.patch: blacklist Thinkpad HDAPS accelerometer device,


--- blkid.patch DELETED ---


--- hal-0.5.10-set-property-direct.patch DELETED ---


--- hal-add-keys-to-buttons.patch DELETED ---


--- hal-tablet-evdev.patch DELETED ---