[kde-workspace] 4.9.98-4

[Rex Dieter]

commit c675e27add08be5f0fddcd5c8ff8e8ca71a3fc80
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 28 09:42:49 2013 -0600

    4.9.98-4
    
    - drop Requires: kde-display-management (for now)
    - switch fedora-plasma-cache hack to env script

 fedora-plasma-cache.sh  |    7 +++++--
 fedora-plasma-cache.upd |    2 --
 kde-workspace.spec      |   22 ++++++++++++++--------
 3 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/fedora-plasma-cache.sh b/fedora-plasma-cache.sh
index 1c47bfe..1241ab5 100755
--- a/fedora-plasma-cache.sh
+++ b/fedora-plasma-cache.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
 
-rm -fv "`kde4-config --path cache`/"*.kcache
-exit 0
+if [ "`kreadconfig --file fedora-plasma-cacherc --group General --key FirstRun --default true`" = "true" ]; then
+  rm -fv "`kde4-config --path cache`/"*.kcache
+  kwriteconfig --file fedora-plasma-cacherc --group General --key FirstRun --type bool false
+  exit 0
+fi
diff --git a/kde-workspace.spec b/kde-workspace.spec
index b2dde14..c2bb72c 100644
--- a/kde-workspace.spec
+++ b/kde-workspace.spec
@@ -5,7 +5,7 @@
 Summary: KDE Workspace
 Name:    kde-workspace
 Version: 4.9.98
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: GPLv2
 URL:     https://projects.kde.org/projects/kde/kde-workspace
@@ -18,8 +18,7 @@ URL:     https://projects.kde.org/projects/kde/kde-workspace
 Source0: http://download.kde.org/%{stable}/%{version}/src/kde-workspace-%{version}.tar.xz
 
 # hack/workaround to invalidate (delete) plasma pixmap cache on upgrade
-Source10: fedora-plasma-cache.upd
-Source11: fedora-plasma-cache.sh
+Source10: fedora-plasma-cache.sh
 
 # RH/Fedora-specific startkde changes
 Patch1: kde-workspace-4.9.90-redhat_startkde.patch
@@ -208,7 +207,9 @@ Requires: kcm_colors = %{version}-%{release}
 Requires: kde-runtime >= %{version}
 
 # to use of kded_randrmonitor or kscreen
-Requires: kde-display-management
+# omit hard dep for now, makes switching between conflicting providers difficult
+# (without having to resort to --nodeps)
+#Requires: kde-display-management
 
 # for kcm_keyboard
 Requires: iso-codes
@@ -305,7 +306,7 @@ log out, and when user switching.
 Summary: RandR monitor kded plugin
 Provides: kde-display-management
 # when split out, upgrade path for now in case Requires: kde-display-management isn't good enough
-#Obsoletes: kde-workspace < 4.9.97-2
+Obsoletes: kde-workspace < 4.9.97-2
 Requires: %{name} = %{version}-%{release}
 %description -n kded_randrmonitor
 %{summary}.
@@ -497,9 +498,9 @@ pushd %{buildroot}%{_kde4_appsdir}/kdm/faces
 ln -sf ../pics/users/%{default_face_icon} .default.face.icon
 popd
 
-# kconf_update scripts
-install -m644 -p %{SOURCE10} %{buildroot}%{_kde4_appsdir}/kconf_update/
-install -m755 -p %{SOURCE11} %{buildroot}%{_kde4_appsdir}/kconf_update/
+# fedora-plasma-cache hack
+mkdir -p %{buildroot}%{_sysconfdir}/kde/env/
+install -m644 -p %{SOURCE10} %{buildroot}%{_sysconfdir}/kde/env/
 
 # unpackaged files
 rm -rfv %{buildroot}%{_kde4_appsdir}/ksplash/Themes/Default/
@@ -531,6 +532,7 @@ fi
 
 %files
 %doc COPYING README
+%{_sysconfdir}/kde/env/fedora-plasma-cache.sh
 %{_kde4_bindir}/kaccess                           
 %{_kde4_bindir}/kapplymousetheme                  
 %{_kde4_bindir}/kblankscrn.kss                    
@@ -984,6 +986,10 @@ fi
 
 
 %changelog
+* Mon Jan 28 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.98-4
+- drop Requires: kde-display-management (for now)
+- switch fedora-plasma-cache hack to env script
+
 * Fri Jan 25 2013 Rex Dieter <rdieter at fedoraproject.org> 4.9.98-3
 - add fedora-plasma-cache kconf_update script