[kde-settings] - %post kdm : sed -e 's|-nr|-background none|' kdmrc (#659684) - %post kdm : drop old stuff

[Rex Dieter]

commit 42f398464968b9e1fbab8bd61e1bb819e7c11a0b
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Dec 8 13:41:48 2010 -0600

    - %post kdm : sed -e 's|-nr|-background none|' kdmrc (#659684)
    - %post kdm : drop old stuff

 kde-settings.spec |   25 +++++++------------------
 1 files changed, 7 insertions(+), 18 deletions(-)
---
diff --git a/kde-settings.spec b/kde-settings.spec
index f9a4afb..0d85638 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -5,7 +5,7 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.6
-Release: %{rel}%{?dist}
+Release: %{rel}%{?dist}.1
 
 Group:   System Environment/Base
 License: Public Domain
@@ -102,24 +102,9 @@ install -D -p -m644 %{SOURCE1} %{buildroot}%{_sysconfdir}/tmpfiles.d/kdm.conf
 rm -rf %{buildroot}
 
 
-%pre kdm
-## KDM fixup(s)
-# handle move from /etc/X11/xdm/kdmrc to /etc/kde/kdm/kdmrc
-[ -L %{_sysconfdir}/kde/kdm/kdmrc ] && \
-  %{__mv} -v %{_sysconfdir}/kde/kdm/kdmrc %{_sysconfdir}/kde/kdm/kdmrc.rpmorig ||:
-# handle %%_datadir/config/kdm -> /etc/kde/kdm
-[ -d %{_datadir}/config/kdm -a ! -L %{_datadir}/config/kdm ] && \
-  %{__mv} -v %{_datadir}/config/kdm %{_datadir}/config/kdm.rpmorig ||:
-
 %post kdm
-## KDM fixup(s)
-# handle move from /etc/X11/xdm/kdmrc to /etc/kde/kdm/kdmrc
-[ ! -f %{_sysconfdir}/kde/kdm/kdmrc -a -f %{_sysconfdir}/kde/kdm/kdmrc.rpmnew ] && \
-  %{__cp} -a %{_sysconfdir}/kde/kdm/kdmrc.rpmnew %{_sysconfdir}/kde/kdm/kdmrc ||:
-# kdm v3 themes don't work (#444730)
-# this hack assumes %_datadir != %_kde4_datadir
-(grep "^Theme=%{_datadir}/apps/kdm/themes/" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
- sed -i -e "s|^Theme=%{_datadir}/apps/kdm/themes/.*|Theme=%{_kde4_appsdir}/kdm/themes/Laughlin|" \
+(grep "^ServerArgsLocal=-nr" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
+ sed -i -e "s|^ServerArgsLocal=-nr|ServerArgsLocal=-background none|" \
  %{_sysconfdir}/kde/kdm/kdmrc
 ) ||:
 
@@ -165,6 +150,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Dec 08 2010 Rex Dieter <rdieter at fedoraproject.org> 4.6-2.1
+- %post kdm : sed -e 's|-nr|-background none|' kdmrc (#659684)
+- %post kdm : drop old stuff
+
 * Fri Dec 03 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.6-2
 - drop old Conflicts
 - Xserver-1.10: Fatal server error: Unrecognized option: -nr (#659684)