[kde-workspace] 4.10.0-6

[Rex Dieter]

commit 2ae7c2f2026e6928eb14610ecc84d54edf16a942
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Sat Feb 9 08:48:57 2013 -0600

    4.10.0-6
    
    - tweak fedora-plasma-cache.sh for plasma-svgelements*, Trolltech.conf too
    - enable powerdevil-login1 support on f18

 fedora-plasma-cache.sh |    2 ++
 kde-workspace.spec     |   21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/fedora-plasma-cache.sh b/fedora-plasma-cache.sh
index fa37375..79c956d 100755
--- a/fedora-plasma-cache.sh
+++ b/fedora-plasma-cache.sh
@@ -2,5 +2,7 @@
 
 if [ "`kreadconfig --file fedora-plasma-cacherc --group General --key FirstRun --default true`" = "true" ]; then
   rm -fv "`kde4-config --path cache`/"*.kcache
+  rm -fv "`kde4-config --path cache`/"plasma-svgelements-*
+  rm -fv ${XDG_CONFIG_HOME-${HOME}/.config}/Trolltech.conf
   kwriteconfig --file fedora-plasma-cacherc --group General --key FirstRun --type bool false
 fi
diff --git a/kde-workspace.spec b/kde-workspace.spec
index 9ab16e1..3cf667e 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -6,10 +6,15 @@
 %define kscreen 1
 %endif
 
+%if 0%{?fedora} > 17
+# hack code to use f18's systemd-197, remove when/if systemd-198 comes available on f18
+%define systemd_login1 1
+%endif
+
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.10.0
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -121,7 +126,6 @@ Patch100: kde-workspace-4.10.1-2stagedevicenotifier.patch
 Patch200: kde-workspace-4.7.80-no_HAL.patch
 Patch210: kdebase-workspace-4.5.90-no_HAL2.patch
 
-
 # rhel patches
 Patch300: kde-workspace-4.8.3-webkit.patch
 
@@ -132,6 +136,9 @@ Obsoletes: kdebase-workspace < 4.7.97-10
 Provides:  kdebase-workspace = %{version}-%{release}
 
 Requires: polkit-kde
+%if 0%{?systemd_login1}
+Requires: systemd >= 197-1.fc18.2
+%endif
 
 %if ! 0%{?akonadi_subpkg}
 Obsoletes: %{name}-akonadi < %{version}-%{release}
@@ -440,9 +447,10 @@ Requires: akonadi
 %patch51 -p1 -b .add_apper_to_kickoff_favorites
 %patch52 -p1 -b .bz#732830-login
 %patch53 -p1 -b .kdm_xauth
-## test only on rawhide for now
-%if 0%{?fedora} > 18
 %patch54 -p1 -b .powerdevil_systemd_login1
+%if 0%{?systemd_login1}
+# allow f18+ version of systemd too
+sed -i -e 's|197|196|g' powerdevil/daemon/backends/upower/powerdevilupowerbackend.cpp
 %endif
 %patch57 -p1 -b .bug796969
 %patch62 -p0 -b .systemd-displaymanager
@@ -985,6 +993,11 @@ fi
 
 
 %changelog
+* Sat Feb 09 2013 Rex Dieter <rdieter at fedoraproject.org> 
+- 4.10.0-6
+- tweak fedora-plasma-cache.sh for plasma-svgelements*, Trolltech.conf too
+- enable powerdevil-login1 support on f18
+
 * Fri Feb 08 2013 Rex Dieter <rdieter at fedoraproject.org> 4.10.0-5
 - fix fedora-plasma-cache.sh (to not exit)