packages: slim/slim.spec - rel 5 - merged systemd stuff into main package

[baggins]

Author: baggins                      Date: Sun Feb  5 16:49:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5
- merged systemd stuff into main package

---- Files affected:
packages/slim:
   slim.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: packages/slim/slim.spec
diff -u packages/slim/slim.spec:1.36 packages/slim/slim.spec:1.37
--- packages/slim/slim.spec:1.36	Tue Jan 17 01:09:43 2012
+++ packages/slim/slim.spec	Sun Feb  5 17:49:31 2012
@@ -7,7 +7,7 @@
 Summary(pl.UTF-8):	SLiM - niezależny od środowiska graficzny zarządca logowania
 Name:		slim
 Version:	1.3.2
-Release:	4
+Release:	5
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://download.berlios.de/slim/%{name}-%{version}.tar.gz
@@ -30,6 +30,7 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	mktemp
 Requires:	rc-scripts >= 0.4.0.10
+Requires:	systemd-units >= 0.38
 Provides:	XDM
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -71,15 +72,6 @@
 - konfigurowalne komunikaty powitania / pożegnania,
 - losowy wybór motywu.
 
-%package systemd
-Summary:	systemd unit for slim
-Group:		Daemons
-Requires:	%{name} = %{version}-%{release}
-
-%description systemd
-systemd unit for slim.
-
-
 %prep
 %setup -q
 %patch0 -p1
@@ -116,6 +108,7 @@
 /sbin/chkconfig --add slim
 # -n option not to actually restart as it will terminate all sessions opened from slim!
 %service -n slim restart "SLiM Display Manager"
+%systemd_post slim.service
 %banner -e %{name} <<EOF
 NOTE: You need to prepare ~/.xinitrc to make slim work.
 Take a look at %{_docdir}/%{name}-%{version}/xinitrc.example
@@ -126,20 +119,19 @@
 	/sbin/chkconfig --del slim
 	%service slim stop
 fi
-
-%post systemd
-%systemd_post slim.service
-
-%preun systemd
 %systemd_preun slim.service
 
-%postun systemd
+%postun
 %systemd_reload
 
+%triggerpostun -- %{name} < 1.3.2-5
+%systemd_trigger slim.service
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog README THEMES TODO xinitrc.sample
 %dir %{_sysconfdir}/X11/slim
+%{systemdunitdir}/slim.service
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/slim/slim.conf
 %attr(754,root,root) /etc/rc.d/init.d/slim
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.slim
@@ -148,16 +140,16 @@
 %{_mandir}/man1/slim.1*
 %{_datadir}/%{name}
 
-%files systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/slim.service
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2012/02/05 16:49:31  baggins
+- rel 5
+- merged systemd stuff into main package
+
 Revision 1.36  2012/01/17 00:09:43  cactus
 - rel 4; systemd subpackage
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/slim/slim.spec?r1=1.36&r2=1.37&f=u