rpms/hal/devel hal-fix-udev-dir.patch, NONE, 1.1 hal.spec, 1.183, 1.184

[Richard Hughes]

Author: rhughes

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

Modified Files:
	hal.spec 
Added Files:
	hal-fix-udev-dir.patch 
Log Message:
* Sat Feb 28 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-22.20090226git
- Fix the udev install path, as upstream hal is broken


hal-fix-udev-dir.patch:

--- NEW FILE hal-fix-udev-dir.patch ---
commit b964fa179dce1cb2e2bee4091fc0c04eb5af6d5b
Author: Richard Hughes <richard at hughsie.com>
Date:   Sat Feb 28 09:14:13 2009 +0000

    allow specifying a udev dir in etc
    
    Fedora still has udev rules dir as /etc/udev/rules.d, so remove the forced lib prefix

diff --git a/tools/linux/Makefile.am b/tools/linux/Makefile.am
index df0782c..484ae6a 100644
--- a/tools/linux/Makefile.am
+++ b/tools/linux/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-udevrulesdir = $(udev_prefix)/lib/udev/rules.d
+udevrulesdir = $(udev_prefix)/udev/rules.d
 udevrules_DATA = 90-hal.rules
 
 


Index: hal.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hal/devel/hal.spec,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- hal.spec	26 Feb 2009 11:46:11 -0000	1.183
+++ hal.spec	28 Feb 2009 09:26:13 -0000	1.184
@@ -28,7 +28,7 @@
 Name: hal
 Version: 0.5.12
 #Release: 14%{?dist}
-Release: 21.%{?alphatag}%{?dist}
+Release: 22.%{?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
@@ -47,6 +47,9 @@
 #Patch6: hal-tablet.patch
 Patch7: hal-tablet-evdev.patch
 
+# upstream
+Patch8: hal-fix-udev-dir.patch
+
 License: AFL or GPLv2
 Group: System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
@@ -145,12 +148,14 @@
 %patch3 -p1 -b .keys
 #%patch6 -p1 -b .tablet
 %patch7 -p1 -b .tablet-evdev
+%patch8 -p1 -b .fix-udev
 
 %build
 %configure                                  \
     --enable-docbook-docs                   \
     --docdir=%{_docdir}/%{name}-%{version}  \
     --with-os-type=redhat                   \
+    --with-udev-prefix=/etc                 \
     --enable-console-kit                    \
     --enable-policy-kit                     \
     --enable-acl-management                 \
@@ -159,6 +164,9 @@
     --enable-acpi-toshiba                   \
     --with-eject=%{_sbindir}/eject
 
+# because of patch8
+automake
+
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -259,7 +267,7 @@
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 
-/usr/lib/udev/rules.d/90-hal.rules
+/etc/udev/rules.d/90-hal.rules
 
 %{_datadir}/PolicyKit/policy/*
 
@@ -291,6 +299,9 @@
 %{_datadir}/gtk-doc/html/libhal-storage/*
 
 %changelog
+* Sat Feb 28 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-22.20090226git
+- Fix the udev install path, as upstream hal is broken
+
 * Thu Feb 26 2009 Richard Hughes <rhughes at redhat.com> - 0.5.12-21.20090226git
 - Update to git snapshot 20090226git
 - Remove upstreamed patches