packages: kde4-kdebase-workspace/kde4-kdebase-workspace.spec - rel 5 - merg...

[baggins]

Author: baggins                      Date: Sun Feb  5 17:08:05 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- merge systemd files for kdm into main package

---- Files affected:
packages/kde4-kdebase-workspace:
   kde4-kdebase-workspace.spec (1.294 -> 1.295) 

---- Diffs:

================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.294 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.295
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.294	Wed Jan 25 12:29:26 2012
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec	Sun Feb  5 18:08:00 2012
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Podstawowe komponenty środowiska KDE 4
 Name:		kde4-kdebase-workspace
 Version:	4.8.0
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		X11/Applications
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -298,6 +298,7 @@
 Requires:	kde4-kgreet
 Requires:	pam >= 0.99.7.1
 Requires:	rc-scripts
+Requires:	systemd-units >= 0.38
 Provides:	XDM
 Provides:	user(kdm)
 Obsoletes:	kdm < 9:3.0.0
@@ -311,14 +312,6 @@
 Program służący do zarządzania zarówno lokalnymi jak i zdalnymi
 sesjami X11. Udostępnia także graficzny tryb logowania.
 
-%package -n kde4-kdm-systemd
-Summary:	systemd unit for KDE Display Manager
-Group:		X11/Applications
-Requires:	kde4-kdm = %{version}-%{release}
-
-%description -n kde4-kdm-systemd
-systemd unit for KDE Display Manager.
-
 %package -n kde4-decoration-aurorae
 Summary:	KDE Window Decoration Engine - Aurorae
 Summary(pl.UTF-8):	Silnik Dekoracji okien dla KDE - Aurorae
@@ -634,21 +627,21 @@
 
 EOF
 fi
+NORESTART=1
+%systemd_post kdm.service
 
 %preun -n kde4-kdm
 if [ "$1" = "0" ]; then
 	/sbin/chkconfig --del kdm
 fi
-
-%post -n kde4-kdm-systemd
-%systemd_post kdm.service
-
-%preun -n kde4-kdm-systemd
 %systemd_preun kdm.service
 
-%postun -n kde4-kdm-systemd
+%postun -n kde4-kdm
 %systemd_reload
 
+%triggerpostun -n kde4-kdm -- kde4-kdm < 4.8.0-5
+%systemd_trigger kdm.service
+
 %files
 %defattr(644,root,root,755)
 # dirs
@@ -1832,9 +1825,6 @@
 %{_datadir}/dbus-1/system-services/org.kde.kcontrol.kcmkdm.service
 %{_sysconfdir}/dbus-1/system.d/org.kde.kcontrol.kcmkdm.conf
 %lang(en) %{_kdedocdir}/en/kdm
-
-%files -n kde4-kdm-systemd
-%defattr(644,root,root,755)
 %{systemdunitdir}/kdm.service
 
 %files svg-icons
@@ -1921,6 +1911,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.295  2012/02/05 17:08:00  baggins
+- rel 5
+- merge systemd files for kdm into main package
+
 Revision 1.294  2012/01/25 11:29:26  matkor
 - Release 4. Gentoo stolen revert for kdm remote/XDMCP logins.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.294&r2=1.295&f=u