[lxqt-common] 0.8.0-7

[Rex Dieter]

commit 3b20cedc97bc779e24463365b8d9a083f17005c2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Fri Dec 19 07:45:07 2014 -0600

    0.8.0-7
    
    - fix lxqt-policykit autostart (moved to libexec)
    - don't mark autostart as %config

 lxqt-common-0.8.0-polkit_libexec.patch |   15 +++++++++++++++
 lxqt-common.spec                       |   11 +++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---
diff --git a/lxqt-common-0.8.0-polkit_libexec.patch b/lxqt-common-0.8.0-polkit_libexec.patch
new file mode 100644
index 0000000..3cbdfec
--- /dev/null
+++ b/lxqt-common-0.8.0-polkit_libexec.patch
@@ -0,0 +1,15 @@
+diff -up lxqt-common-0.8.0/autostart/CMakeLists.txt.libexec lxqt-common-0.8.0/autostart/CMakeLists.txt
+diff -up lxqt-common-0.8.0/autostart/lxqt-policykit-agent.desktop.in.libexec lxqt-common-0.8.0/autostart/lxqt-policykit-agent.desktop.in
+--- lxqt-common-0.8.0/autostart/lxqt-policykit-agent.desktop.in.libexec	2014-08-23 04:12:54.000000000 -0500
++++ lxqt-common-0.8.0/autostart/lxqt-policykit-agent.desktop.in	2014-12-19 07:39:50.814981890 -0600
+@@ -1,8 +1,8 @@
+ [Desktop Entry]
+ Type=Application
+ Name=PolicyKit Handler
+-TryExec=lxqt-policykit-agent
+-Exec=lxqt-policykit-agent
++TryExec=/usr/libexec/lxqt-policykit-agent
++Exec=/usr/libexec/lxqt-policykit-agent
+ OnlyShowIn=LXQt;
+ X-LXQt-Module=true
+ 
diff --git a/lxqt-common.spec b/lxqt-common.spec
index 84a2e7e..5f916ad 100644
--- a/lxqt-common.spec
+++ b/lxqt-common.spec
@@ -7,7 +7,7 @@
 Name:    lxqt-common
 Summary: Common resources for LXQt desktop suite
 Version: 0.8.0
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPLv2+
 URL:     http://lxqt.org/
 Source0: http://lxqt.org/downloads/lxqt/0.8.0/%{name}-%{version}.tar.xz
@@ -15,6 +15,8 @@ Patch0:  lxqt-common-0.8.0-datadir.patch
 Patch1:  lxqt-common-0.8.0-desktop-launch.patch
 # From https://github.com/lxde/lxqt-common/pull/7.patch
 Patch2:  lxqt-common-xdg_data_dir.patch
+# fedora's polkit agent patched to be in libexec instead of bin/
+Patch3: lxqt-common-0.8.0-polkit_libexec.patch
 BuildArch: noarch
 
 Requires: oxygen-icon-theme
@@ -34,6 +36,7 @@ BuildRequires: desktop-file-utils
 %patch0 -p1 -b .qt5-path
 %patch1 -p1 -b .desktop-launch
 %patch2 -p1 -b .xdg-data
+%patch3 -p1 -b .libexec
 
 %build
 mkdir -p %{_target_platform}
@@ -55,7 +58,7 @@ done
 %files
 %{_bindir}/startlxqt	
 %dir %{_sysconfdir}/xdg/lxqt
-%config(noreplace) %{_sysconfdir}/xdg/autostart/lxqt-*
+%{_sysconfdir}/xdg/autostart/lxqt-*
 %config(noreplace) %{_sysconfdir}/xdg/lxqt/*
 %{_datadir}/xsessions/lxqt.desktop
 %dir %{_sysconfdir}/xdg/pcmanfm-qt
@@ -66,6 +69,10 @@ done
 %exclude %{_datadir}/apps/kdm/sessions/lxqt.desktop
 
 %changelog
+* Fri Dec 19 2014 Rex Dieter <rdieter at fedoraproject.org> - 0.8.0-7
+- fix lxqt-policykit autostart (moved to libexec)
+- don't mark autostart as %%config
+
 * Mon Nov 10 2014 Helio Chissini de Castro <hcastro at redhat.com> - 0.8.0-6
 - For some reason Xdg went away on buildreqs.