[kde-settings] * Mon Jan 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8-2 - Allow org.kde.kcontrol.kcmclock.save

[Kevin Kofler]

commit 6f233c28ad8b2a94439882286ff7ca0b9ff7c14b
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Mon Jan 16 22:11:40 2012 +0100

    * Mon Jan 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8-2
    - Allow org.kde.kcontrol.kcmclock.save without password for wheel again

 .gitignore        |    1 +
 kde-settings.spec |   16 ++++++----------
 sources           |    2 +-
 3 files changed, 8 insertions(+), 11 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c99ac29..4496a2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /kde-settings-plasma-rpm-20110927.tar.xz
 /kde-settings-4.7-14.tar.xz
 /kde-settings-4.8-1.tar.xz
+/kde-settings-4.8-2.tar.xz
diff --git a/kde-settings.spec b/kde-settings.spec
index 9e7af8f..00e3f1b 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,11 +1,6 @@
 # THIS SPECFILE IS FOR F17+ ONLY!
 
-# ship the Plasma RPM dependency generators only on F17+
-%if 0%{?fedora} > 16
-%global plasma_rpm 1
-%endif
-
-%global rel 1
+%global rel 2
 %global system_kde_theme_ver 15.90
 
 Summary: Config files for kde
@@ -79,7 +74,7 @@ Requires: alsa-plugins-pulseaudio
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{rel} %{?plasma_rpm:-a 1}
+%setup -q -n %{name}-%{version}-%{rel} -a 1
 
 
 %build
@@ -138,11 +133,9 @@ rm -rf %{buildroot}
 %config %{_sysconfdir}/kderc
 %config %{_sysconfdir}/kde4rc
 %{_datadir}/kde-settings/
-%if 0%{?plasma_rpm}
 %{_prefix}/lib/rpm/plasma4.prov
 %{_prefix}/lib/rpm/plasma4.req
 %{_prefix}/lib/rpm/fileattrs/plasma4.attr
-%endif
 
 %files kdm
 %defattr(-,root,root,-)
@@ -179,8 +172,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Jan 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 4.8-2
+- Allow org.kde.kcontrol.kcmclock.save without password for wheel again
+
 * Mon Jan 16 2012 Rex Dieter <rdieter at fedoraproject.org> 4.8-1
-- kwinrc: drop [Compsiting] Enabled=false
+- kwinrc: drop [Compositing] Enabled=false
 
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.7-14.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index 3e035a4..6fe529b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 1ba7c8a66a359aaaab650baba3813513  kde-settings-plasma-rpm-20110927.tar.xz
-a0ee53ebee0ac29eb7f9ef58b1383ecc  kde-settings-4.8-1.tar.xz
+f200560dc0e5b9644f11d240c3608894  kde-settings-4.8-2.tar.xz