[kde-settings] kdm: drop old stuff, fix systemd scriptlets

Rex Dieter rdieter at fedoraproject.org
Sat Aug 11 17:14:15 UTC 2012


commit 4c789106355b9d8188adbadb14d09864e0db9f1a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Aug 11 12:18:03 2012 -0500

    kdm: drop old stuff, fix systemd scriptlets

 kde-settings.spec |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/kde-settings.spec b/kde-settings.spec
index 34713a9..5aefd5b 100644
--- a/kde-settings.spec
+++ b/kde-settings.spec
@@ -1,12 +1,12 @@
 # THIS SPECFILE IS FOR F18+ ONLY!
 
-%global rel 2 
+%global rel 2
 %global system_kde_theme_ver 16.91
 
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.9
-Release: %{rel}%{?dist}
+Release: %{rel}%{?dist}.1
 
 License: MIT
 Url:     http://fedorahosted.org/kde-settings
@@ -155,15 +155,11 @@ perl -pi -e "s,^View0_URL=.*,View0_URL=file:///usr/share/doc/HTML/index.html," %
 %endif
 
 %post kdm
-%{systemd_post} kdm.service
-(grep "^ServerArgsLocal=-nr" %{_sysconfdir}/kde/kdm/kdmrc > /dev/null && \
- sed -i -e "s|^ServerArgsLocal=-nr|ServerArgsLocal=-background none|" \
- %{_sysconfdir}/kde/kdm/kdmrc
-) ||:
+%systemd_post kdm.service
 %preun kdm
-%{systemd_preun} kdm.service
+%systemd_preun kdm.service
 %postun kdm
-%{systemd_postun}
+%systemd_postun
 
 %files kdm
 %doc COPYING
@@ -203,6 +199,9 @@ perl -pi -e "s,^View0_URL=.*,View0_URL=file:///usr/share/doc/HTML/index.html," %
 
 
 %changelog
+* Sat Aug 11 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9-2.1
+- -kdm: drop old stuff, fix systemd scriptlets
+
 * Thu Aug 09 2012 Rex Dieter <rdieter at fedoraproject.org> 4.9-2
 - /etc/pam.d/kdm missing: -session optional pam_ck_connector.so (#847114)
 


More information about the scm-commits mailing list