[kde-settings] fix #829881 (.pkla→.rules) and #861129 (translated user dirs)

[Kevin Kofler]

commit dcffb76ab08f0b4bb82899f557b010510d6c4e75
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Fri Oct 12 20:24:19 2012 +0200

    fix #829881 (.pkla→.rules) and #861129 (translated user dirs)
    
    * Fri Oct 12 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 19-7
    - port 11-fedora-kde-policy from old pkla format to new polkit-1 rules (#829881)
    - nepomukstrigirc: index translated xdg-user-dirs (dvratil, #861129)

 .gitignore        |    1 +
 kde-settings.spec |   13 ++++++++-----
 sources           |    2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f37c1b9..f7c4eda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /kde-settings-4.9-5.tar.xz
 /kde-settings-19-4.tar.xz
 /kde-settings-19-5.tar.xz
+/kde-settings-19-7.tar.xz
diff --git a/kde-settings.spec b/kde-settings.spec
index a403b19..e913ada 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,5 +1,5 @@
 
-%global rel 5
+%global rel 7
 %global system_kde_theme_ver 17.91
 
 Summary: Config files for kde
@@ -21,8 +21,8 @@ Requires: kde-filesystem
 Requires: pam
 Requires: xdg-user-dirs
 Requires: adwaita-cursor-theme
-# /var/lib/polkit-1/localauthority/10-vendor.d/ ownership
-Requires: polkit
+# /usr/share/polkit-1/rules.d/ ownership
+Requires: polkit >= 0.106
 
 Requires(post): coreutils sed
 
@@ -126,7 +126,7 @@ mkdir -p %{buildroot}%{_localstatedir}/run/kdm
 %if 0%{?rhel}
 rm -rf %{buildroot}%{_sysconfdir}/kde/env/fedora-bookmarks.sh \
        %{buildroot}%{_prefix}/lib/rpm \
-       %{buildroot}%{_localstatedir}/lib/polkit-1/
+       %{buildroot}%{_datadir}/polkit-1/
 echo "[Theme]" > %{buildroot}%{_datadir}/kde-settings/kde-profile/default/share/config/plasmarc
 echo "name=RHEL7" >> %{buildroot}%{_datadir}/kde-settings/kde-profile/default/share/config/plasmarc
 echo "[KSplash]" > %{buildroot}%{_datadir}/kde-settings/kde-profile/default/share/config/ksplashrc
@@ -148,7 +148,7 @@ perl -pi -e "s,^View0_URL=.*,View0_URL=file:///usr/share/doc/HTML/index.html," %
 %{_prefix}/lib/rpm/plasma4.prov
 %{_prefix}/lib/rpm/plasma4.req
 %{_prefix}/lib/rpm/fileattrs/plasma4.attr
-%{_localstatedir}/lib/polkit-1/localauthority/10-vendor.d/11-fedora-kde-policy.pkla
+%{_datadir}/polkit-1/rules.d/11-fedora-kde-policy.rules
 %endif
 %config(noreplace) /etc/pam.d/kcheckpass
 %config(noreplace) /etc/pam.d/kscreensaver
@@ -212,6 +212,9 @@ perl -pi -e "s,^View0_URL=.*,View0_URL=file:///usr/share/doc/HTML/index.html," %
 
 
 %changelog
+* Fri Oct 12 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 19-7
+- port 11-fedora-kde-policy from old pkla format to new polkit-1 rules (#829881)
+- nepomukstrigirc: index translated xdg-user-dirs (dvratil, #861129)
 
 * Thu Sep 27 2012 Dan Vratil <dvratil at redhat.com> 19-5
 - fix indexing paths in nepomukstrigirc (#861129)
diff --git a/sources b/sources
index dd7af07..fcb575e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c621d5fd44ca56c767b76dbce0aa38ab  kde-settings-19-5.tar.xz
+397a16b09a3552a3e6395b64477284fb  kde-settings-19-7.tar.xz