- fix more breakage

Changed files:
    udevlibexecdir.patch -> 1.2

diff --git a/udevlibexecdir.patch b/udevlibexecdir.patch
index f22bb30e9131a3aa487c2cf1382c6017ddb7e80e..aaa210b10509dd701a70f6da03bb4e7e10d6ced3 100644 (file)
--- a/udevlibexecdir.patch
+++ b/udevlibexecdir.patch
@@ -11,6 +11,15 @@
  
  # And these are the special ones for /
  rootprefix=@rootprefix@
+@@ -131,7 +131,7 @@
+       -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
+       -DX_SERVER=\"$(bindir)/X\" \
+-      -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
++      -DUDEVLIBEXECDIR=\""$(udevlibexecdir)"\" \
+       -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+       -I $(top_srcdir)/src \
+       -I $(top_srcdir)/src/shared \
 @@ -1434,7 +1434,7 @@
  
  udev-confdirs:
@@ -38,3 +47,23 @@
  dist_udevkeymapforcerel_DATA = \
        keymaps-force-release/dell-touchpad \
        keymaps-force-release/dell-xps \
+@@ -2981,7 +2981,7 @@
+               -e 's,@includedir\@,$(includedir),g' \
+               -e 's,@VERSION\@,$(VERSION),g' \
+               -e 's,@rootprefix\@,$(rootprefix),g' \
+-              -e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \
++              -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
+               < $< > $@ || rm $@
+ 
+ units/%: units/%.in Makefile
+--- systemd-183/src/udev/keymap/keyboard-force-release.sh~     2012-04-10 22:32:29.934866904 +0200
++++ systemd-183/src/udev/keymap/keyboard-force-release.sh      2012-05-29 12:52:33.283726546 +0200
+@@ -6,7 +6,7 @@
+ 
+ case "$2" in
+         /*) scf="$2" ;;
+-        *)  scf="@pkglibexecdir@/keymaps/force-release/$2" ;;
++        *)  scf="@udevlibexecdir@/keymaps/force-release/$2" ;;
+ esac
+ 
+ read attr <"/sys/$1/force_release"