packages: gdm/gdm.spec - rel 10 - merged systemd stuff into main package

[baggins]

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

---- Files affected:
packages/gdm:
   gdm.spec (1.291 -> 1.292) 

---- Diffs:

================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.291 packages/gdm/gdm.spec:1.292
--- packages/gdm/gdm.spec:1.291	Tue Jan 31 12:52:22 2012
+++ packages/gdm/gdm.spec	Sun Feb  5 17:35:57 2012
@@ -16,7 +16,7 @@
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
 Version:	3.2.1.1
-Release:	9
+Release:	10
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
@@ -97,6 +97,7 @@
 Requires:	hicolor-icon-theme
 Requires:	pam >= 0.99.7.1
 Requires:	polkit-gnome >= 0.93
+Requires:	systemd-units >= 37-0.10
 Requires:	which
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
@@ -212,16 +213,6 @@
 %description upstart -l pl.UTF-8
 Opis zadania Upstart dla GDM.
 
-%package systemd
-Summary:	systemd unit for GDM
-Group:		Daemons
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	accountsservice-systemd
-Requires:	systemd-units >= 37-0.10
-
-%description systemd
-systemd unit for GDM
-
 %prep
 %setup -q
 %patch0 -p1
@@ -302,13 +293,17 @@
 %gconf_schema_install gdm-simple-greeter.schemas
 %scrollkeeper_update_post
 %update_icon_cache hicolor
+NORESTART=1
+%systemd_post gdm.service
 
 %preun
 %gconf_schema_uninstall gdm-simple-greeter.schemas
+%systemd_preun gdm.service
 
 %postun
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
+%systemd_reload
 
 if [ "$1" = "0" ]; then
 	%glib_compile_schemas
@@ -316,10 +311,11 @@
 	%groupremove xdm
 fi
 
-%triggerpostun -- %{name} < 1:2.13.0.8-1
+%triggerpostun -- %{name} < 2:3.2.1.1-10
 if [ -f /etc/X11/gdm/gdm.conf-custom.rpmsave ]; then
 	mv /etc/X11/gdm/gdm.conf-custom.rpmsave /etc/gdm/custom.conf
 fi
+%systemd_trigger gdm.service
 
 %post init
 /sbin/chkconfig --add gdm
@@ -335,16 +331,6 @@
 %post   libs -p /sbin/ldconfig
 %postun libs -p /sbin/ldconfig
 
-%post systemd
-NORESTART=1
-%systemd_post gdm.service
-
-%preun systemd
-%systemd_preun gdm.service
-
-%postun systemd
-%systemd_reload
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
@@ -406,6 +392,7 @@
 %{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
 %{_datadir}/glib-2.0/schemas/org.gnome.login-screen.gschema.xml
+%{systemdunitdir}/gdm.service
 
 %files libs
 %defattr(644,root,root,755)
@@ -442,16 +429,16 @@
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/init/%{name}.conf
 
-%files systemd
-%defattr(644,root,root,755)
-%{systemdunitdir}/gdm.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.292  2012/02/05 16:35:57  baggins
+- rel 10
+- merged systemd stuff into main package
+
 Revision 1.291  2012/01/31 11:52:22  baggins
 - release 9
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm.spec?r1=1.291&r2=1.292&f=u