rpms/hal/devel .cvsignore, 1.62, 1.63 hal.spec, 1.182, 1.183 sources, 1.64, 1.65 hal-dbus-perms.patch, 1.1, NONE hal-joystick.patch, 1.2, NONE

[Richard Hughes]

Author: rhughes

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

Modified Files:
	.cvsignore hal.spec sources 
Removed Files:
	hal-dbus-perms.patch hal-joystick.patch 
Log Message:
* Thu Feb 26 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-21.20090226git
- Update to git snapshot 20090226git
- Remove upstreamed patches
- Disable a patch that should be upstream and no longer applies
- Use the correct loaction for udev rules.d



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/.cvsignore,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- .cvsignore	19 Dec 2008 13:20:28 -0000	1.62
+++ .cvsignore	26 Feb 2009 11:46:11 -0000	1.63
@@ -1 +1 @@
-hal-0.5.12-20081219git.tar.gz
+hal-0.5.12-20090226git.tar.gz


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.182
retrieving revision 1.183
diff -u -r1.182 -r1.183
--- hal.spec	25 Feb 2009 03:15:31 -0000	1.182
+++ hal.spec	26 Feb 2009 11:46:11 -0000	1.183
@@ -20,7 +20,7 @@
 %define acl_version             2.2.39
 %define policykit_version       0.7
 %define gperf_version           3.0.1
-%define alphatag                20081219git
+%define alphatag                20090226git
 
 %define hal_user_uid            68
 
@@ -28,7 +28,7 @@
 Name: hal
 Version: 0.5.12
 #Release: 14%{?dist}
-Release: 20.%{?alphatag}%{?dist}
+Release: 21.%{?alphatag}%{?dist}
 URL: http://www.freedesktop.org/Software/hal
 #Source0: http://hal.freedesktop.org/releases/%{name}-%{version}rc1.tar.bz2
 Source0: http://hal.freedesktop.org/releases/%{name}-%{version}-%{?alphatag}.tar.gz
@@ -39,11 +39,12 @@
 Patch1: hal-0.5.10-set-property-direct.patch
 Patch2: hal-change-priority.patch
 Patch3: hal-add-keys-to-buttons.patch
-Patch4: hal-joystick.patch
-# https://bugs.freedesktop.org/show_bug.cgi?id=18985
-Patch5: hal-dbus-perms.patch
+
+# -- I have disabled patch6 as the code upstream is very different, and possibly
+#    fixed in a different way. Can you get this patch upstream if this is not
+#    correct please. Thanks, Richard Hughes.
 # https://bugzilla.redhat.com/show_bug.cgi?id=473144
-Patch6: hal-tablet.patch
+#Patch6: hal-tablet.patch
 Patch7: hal-tablet-evdev.patch
 
 License: AFL or GPLv2
@@ -142,9 +143,7 @@
 %patch1 -p1 -b .direct
 %patch2 -p1 -b .priority
 %patch3 -p1 -b .keys
-%patch4 -p1 -b .joystick
-%patch5 -p1 -b .dbus
-%patch6 -p1 -b .tablet
+#%patch6 -p1 -b .tablet
 %patch7 -p1 -b .tablet-evdev
 
 %build
@@ -260,7 +259,7 @@
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 
-%{_sysconfdir}/udev/rules.d/90-hal.rules
+/usr/lib/udev/rules.d/90-hal.rules
 
 %{_datadir}/PolicyKit/policy/*
 
@@ -292,6 +291,12 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Thu Feb 26 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-21.20090226git
+- Update to git snapshot 20090226git
+- Remove upstreamed patches
+- Disable a patch that should be upstream and no longer applies
+- Use the correct loaction for udev rules.d
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.12-20.20081219git
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/sources,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- sources	19 Dec 2008 13:20:28 -0000	1.64
+++ sources	26 Feb 2009 11:46:11 -0000	1.65
@@ -1 +1 @@
-83379310a7c2a1810afe4216a992ee16  hal-0.5.12-20081219git.tar.gz
+657240028e6119fe3b15340265b43357  hal-0.5.12-20090226git.tar.gz


--- hal-dbus-perms.patch DELETED ---


--- hal-joystick.patch DELETED ---