packages: gdm2.20/gdm2.20.spec - rel 4 - mask systemd gdm service and requi...

[baggins]

Author: baggins                      Date: Sun Mar 18 13:01:21 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- 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/gdm2.20:
   gdm2.20.spec (1.267 -> 1.268) 

---- Diffs:

================================================================
Index: packages/gdm2.20/gdm2.20.spec
diff -u packages/gdm2.20/gdm2.20.spec:1.267 packages/gdm2.20/gdm2.20.spec:1.268
--- packages/gdm2.20/gdm2.20.spec:1.267	Fri Feb  4 19:23:45 2011
+++ packages/gdm2.20/gdm2.20.spec	Sun Mar 18 14:01:16 2012
@@ -16,7 +16,7 @@
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm2.20
 Version:	2.20.11
-Release:	3
+Release:	4
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
@@ -58,7 +58,7 @@
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(find_lang) >= 1.23
-BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	rpmbuild(macros) >= 1.627
 BuildRequires:	scrollkeeper
 BuildRequires:	sed >= 4.0
 BuildRequires:	xorg-lib-libXdmcp-devel
@@ -76,7 +76,9 @@
 Requires(pre):	/usr/sbin/useradd
 Requires:	libgnomeui >= 2.20.0
 Requires:	pam >= 0.99.7.1
+Requires:	systemd-units >= 37-0.10
 Requires:	which
+Requires:	xinitrc-ng >= 1.0
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
 Suggests:	zenity
@@ -198,7 +200,8 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
 	$RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
-	$RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky
+	$RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky \
+	$RPM_BUILD_ROOT%{systemdunitdir}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -213,6 +216,8 @@
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+ln -s /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/gdm.service
+
 install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
@@ -235,10 +240,12 @@
 %post
 %scrollkeeper_update_post
 %update_icon_cache hicolor
+%systemd_reload
 
 %postun
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
+%systemd_reload
 
 if [ "$1" = "0" ]; then
 	%userremove xdm
@@ -282,6 +289,7 @@
 %attr(755,root,root) %{_libdir}/gdmlogin
 %attr(755,root,root) %{_sbindir}/*
 
+%{systemdunitdir}/gdm.service
 %dir %{_sysconfdir}/gdm
 %dir %{_sysconfdir}/gdm/Init
 %dir %{_sysconfdir}/gdm/PreSession
@@ -327,6 +335,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.268  2012/03/18 13:01:16  baggins
+- rel 4
+- 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.267  2011/02/04 18:23:45  wiget
 - Requires(post,postun): gtk-update-icon-cache
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm2.20/gdm2.20.spec?r1=1.267&r2=1.268&f=u