Fix wrapper path in AppArmor profile (broken since 1.1.1)

r1358 broke this by moving the wrapper into pkglibexecdir.

diff --git a/NEWS b/NEWS
index f291374092ae6dc063458d90ef61708f976dfc14..6e0f7bc35af5a4d74438876e027eb98cb584587e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Overview of changes in lightdm 1.2.1
+
+    * Fix wrapper path in AppArmor profile (broken since 1.1.1)
+
 Overview of changes in lightdm 1.2.0
 
     * Backup .xsession-errors on login

diff --git a/data/Makefile.am b/data/Makefile.am
index 590dd242c60eae70976a5571852a41211f807f8d..376e2f1388e987083b29445885ae347d49570330 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,7 @@ apparmor_profiledir = $(sysconfdir)/apparmor.d
 
 install-data-hook:
        install -d $(DESTDIR)$(apparmor_profiledir)
-       sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \
+       sed 's!PKGLIBEXECDIR!$(pkglibexecdir)!g' < $(srcdir)/guest-session.apparmor \
                > $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session
 
 dist_man1_MANS = lightdm.1

diff --git a/data/guest-session.apparmor b/data/guest-session.apparmor
index cf90d5f1bf740eda871a4b7452203c75c83dbcc4..60b622f324ba252699bbcd9d2aec84cb08ba78f1 100644 (file)
--- a/data/guest-session.apparmor
+++ b/data/guest-session.apparmor
@@ -4,7 +4,7 @@
 
 #include <tunables/global>
 
-LIBEXECDIR/lightdm-guest-session-wrapper {
+PKGLIBEXECDIR/lightdm-guest-session-wrapper {
   #include <abstractions/authentication>
   #include <abstractions/nameservice>
   #include <abstractions/wutmp>