packages: gdm/gdm.spec - rel 12 - mask systemd gdm service and require xini...

[baggins]

Author: baggins                      Date: Sun Mar 18 12:43:45 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 12
- mask systemd gdm service and require xinitrc-ng >= 1.0 to start gdm via prefdm
- xinitrc-ng as such should be in R long ago

---- Files affected:
packages/gdm:
   gdm.spec (1.293 -> 1.294) 

---- Diffs:

================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.293 packages/gdm/gdm.spec:1.294
--- packages/gdm/gdm.spec:1.293	Sun Feb  5 18:35:28 2012
+++ packages/gdm/gdm.spec	Sun Mar 18 13:43:40 2012
@@ -16,7 +16,7 @@
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
 Version:	3.2.1.1
-Release:	11
+Release:	12
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
@@ -29,7 +29,6 @@
 Source5:	%{name}-custom.desktop
 Source6:	%{name}-default.desktop
 Source7:	%{name}.upstart
-Source8:	%{name}.service
 Source9:	%{name}.tmpfiles
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-polkit.patch
@@ -99,6 +98,7 @@
 Requires:	polkit-gnome >= 0.93
 Requires:	systemd-units >= 37-0.10
 Requires:	which
+Requires:	xinitrc-ng >= 1.0
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
 Suggests:	pam-pam_gnome_keyring
@@ -264,7 +264,7 @@
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/init/%{name}.conf
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
-cp -p %{SOURCE8} $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
 install %{SOURCE9} $RPM_BUILD_ROOT/usr/lib/tmpfiles.d/%{name}.conf
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
@@ -436,6 +436,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.294  2012/03/18 12:43:40  baggins
+- rel 12
+- mask systemd gdm service and require xinitrc-ng >= 1.0 to start gdm via prefdm
+- xinitrc-ng as such should be in R long ago
+
 Revision 1.293  2012/02/05 17:35:28  baggins
 - rel 11
 - added O:-systemd
================================================================

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