SPECS: kdebase4-workspace.spec - use rpm automatics to skip kdm re...

[glen]

Author: glen                         Date: Sun Jan 20 15:20:46 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use rpm automatics to skip kdm restart

---- Files affected:
SPECS:
   kdebase4-workspace.spec (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: SPECS/kdebase4-workspace.spec
diff -u SPECS/kdebase4-workspace.spec:1.13 SPECS/kdebase4-workspace.spec:1.14
--- SPECS/kdebase4-workspace.spec:1.13	Sun Jan 20 16:12:44 2008
+++ SPECS/kdebase4-workspace.spec	Sun Jan 20 16:20:40 2008
@@ -28,6 +28,7 @@
 Source2:	kdebase-kdm.pam
 Source3:	kdebase-kdm-np.pam
 Source4:	kdebase-kdm.init
+Source5:	kdebase-kdm.sysconfig
 Source6:	kdebase-kdm_pldlogo.png
 Source7:	kdebase-kdm_pldwallpaper.png
 Source15:	%{name}-kde4.desktop
@@ -490,7 +491,7 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	kde_htmldir=%{_kdedocdir}
 
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig}
 install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,security}
 install -d $RPM_BUILD_ROOT%{_datadir}/config/kdm
 
@@ -498,6 +499,7 @@
 install %{SOURCE2}	$RPM_BUILD_ROOT/etc/pam.d/kdm
 install %{SOURCE3}	$RPM_BUILD_ROOT/etc/pam.d/kdm-np
 install %{SOURCE4}	$RPM_BUILD_ROOT/etc/rc.d/init.d/kdm
+install %{SOURCE5}	$RPM_BUILD_ROOT/etc/sysconfig/kdm
 
 install %{SOURCE6}	$RPM_BUILD_ROOT%{_datadir}/apps/kdm/pics/pldlogo.png
 install %{SOURCE7}	$RPM_BUILD_ROOT%{_datadir}/wallpapers/kdm_pld.png
@@ -522,28 +524,7 @@
 
 %post -n kdm
 /sbin/chkconfig --add kdm
-if [ -f /var/lock/subsys/kdm ]; then
-	%banner kdm -e <<EOF
- ***************************************************
- *                                                 *
- * NOTE:                                           *
- * To make sure that new version of KDM is running *
- * You should restart KDM with:                    *
- * "/sbin/service kdm restart".                    *
- *                                                 *
- * WARNING:                                        *
- * Restarting KDM will terminate any X session     *
- * started by it!                                  *
- *                                                 *
- ***************************************************
-
-EOF
-else
-	%banner kdm -e <<EOF
-Run "/sbin/service kdm start" to start kdm.
-
-EOF
-fi
+%service kdm restart
 
 %preun -n kdm
 if [ "$1" = "0" ]; then
@@ -1117,6 +1098,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/kdm
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/kdm-np
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.kdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/kdm
 %dir %{_datadir}/config/kdm
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_datadir}/config/kdm/*
 %attr(754,root,root) /etc/rc.d/init.d/kdm
@@ -1330,6 +1312,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.14  2008-01-20 15:20:40  glen
+- use rpm automatics to skip kdm restart
+
 Revision 1.13  2008-01-20 15:12:44  pascalek
 - md5sum, pam, pld stuff, lang(en)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/kdebase4-workspace.spec?r1=1.13&r2=1.14&f=u