Add patch to fix udev rules path

diff --git a/packaging/pulseaudio.changes b/packaging/pulseaudio.changes
index 7317bd7..d1c4c30 100644 (file)
--- a/packaging/pulseaudio.changes
+++ b/packaging/pulseaudio.changes
@@ -1,3 +1,6 @@
+* Mon Jul 02 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> 95dbd85
+- Add patch to fix udev rules path
+
 * Mon Jun 25 2012 Patrick McCarty <patrick.mccarty@linux.intel.com> - 0.9.21
 - Create initscript symlinks in the %install section
 - Add/install a systemd service file

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index a5cecc8..9028e43 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -10,6 +10,7 @@ URL:        http://pulseaudio.org
 Source0:    http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}.tar.gz
 Source1:    pulseaudio.service
 Source1001: packaging/pulseaudio.manifest
+Patch0:     udev-path-fix.patch
 Requires:   udev
 Requires:   systemd
 Requires(preun): /usr/bin/systemctl
@@ -110,6 +111,7 @@ Description: %{summary}
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -204,7 +206,7 @@ systemctl daemon-reload
 %{_libexecdir}/pulse/*
 %{_libdir}/libpulsecore-%{pulseversion}.so
 %{_libdir}/libpulse-mainloop-glib.so.*
-/lib/udev/rules.d/90-pulseaudio.rules
+%{_libdir}/udev/rules.d/90-pulseaudio.rules
 %{_bindir}/pamon
 %config %{_sysconfdir}/xdg/autostart/pulseaudio.desktop
 %{_sysconfdir}/dbus-1/system.d/pulseaudio-system.conf

diff --git a/packaging/udev-path-fix.patch b/packaging/udev-path-fix.patch
new file mode 100644 (file)
index 0000000..0999466
--- /dev/null
+++ b/packaging/udev-path-fix.patch
@@ -0,0 +1,12 @@
+diff -ru pulseaudio-0.9.21.orig/src/Makefile.am pulseaudio-0.9.21/src/Makefile.am
+--- pulseaudio-0.9.21.orig/src/Makefile.am     2012-06-03 01:05:39.000000000 -0700
++++ pulseaudio-0.9.21/src/Makefile.am  2012-06-28 10:40:32.588579343 -0700
+@@ -31,7 +31,7 @@
+ xdgautostartdir=$(sysconfdir)/xdg/autostart
+ alsaprofilesetsdir=$(datadir)/pulseaudio/alsa-mixer/profile-sets
+ alsapathsdir=$(datadir)/pulseaudio/alsa-mixer/paths
+-udevrulesdir=/lib/udev/rules.d
++udevrulesdir=/usr/lib/udev/rules.d
+ dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+ 
+ ###################################