packages: gdm/gdm.spec, gdm/gdm-custom.desktop (NEW), gdm/gdm-default.deskt...

[sparky]

Author: sparky                       Date: Sun Nov 15 20:54:58 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added "custom" an "default" desktop files to xsessions dir - they allow
  starting ~/.Xclients and ~/.xsession scripts
- BR: polkit-gnome-devel >= 0.92
- S: zenity
- rel 2

---- Files affected:
packages/gdm:
   gdm.spec (1.248 -> 1.249) , gdm-custom.desktop (NONE -> 1.1)  (NEW), gdm-default.desktop (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.248 packages/gdm/gdm.spec:1.249
--- packages/gdm/gdm.spec:1.248	Fri Oct 23 15:45:03 2009
+++ packages/gdm/gdm.spec	Sun Nov 15 21:54:52 2009
@@ -21,7 +21,7 @@
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
 Version:	2.28.1
-Release:	1
+Release:	2
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
@@ -31,6 +31,8 @@
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
 #Source4:	%{name}-autologin.pamd
+Source5:	%{name}-custom.desktop
+Source6:	%{name}-default.desktop
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-polkit.patch
 Patch2:		%{name}-xsession.patch
@@ -62,6 +64,7 @@
 BuildRequires:	pam-devel
 BuildRequires:	perl-modules
 BuildRequires:	pkgconfig
+BuildRequires:	polkit-gnome-devel >= 0.92
 BuildRequires:	rpmbuild(find_lang) >= 1.23
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper
@@ -70,9 +73,9 @@
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libdmx-devel
 Requires(post,preun):	GConf2
+Requires(post,postun):	/usr/bin/scrollkeeper-update
 Requires(post,postun):	gtk+2
 Requires(post,postun):	hicolor-icon-theme
-Requires(post,postun):	/usr/bin/scrollkeeper-update
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires(pre):	/bin/id
@@ -86,6 +89,7 @@
 Requires:	which
 Requires:	xorg-app-sessreg
 Requires:	xorg-app-xmodmap
+Suggests:	zenity
 Provides:	XDM
 Provides:	group(xdm)
 Provides:	user(xdm)
@@ -196,6 +200,7 @@
 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}/xsessions
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -211,11 +216,9 @@
 
 %find_lang %{name} --with-gnome --with-omf --all-name
 
-# Remove useless files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
-
-# moved to gnome-session
-rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+# allow executing ~/.Xclients and ~/.xsession
+install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
+install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -286,7 +289,7 @@
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/custom.conf
 %{_sysconfdir}/gdm/gdm.schemas
 %{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/*
+%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gdm*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.gdm
 %attr(1770,root,xdm) %{_localstatedir}/gdm
@@ -301,6 +304,8 @@
 %{_pixmapsdir}/*
 %{_datadir}/gdm
 %{_datadir}/polkit-1/actions/gdm.policy
+%{_datadir}/xsessions/custom.desktop
+%{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
 
 %files init
@@ -319,6 +324,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.249  2009/11/15 20:54:52  sparky
+- added "custom" an "default" desktop files to xsessions dir - they allow
+  starting ~/.Xclients and ~/.xsession scripts
+- BR: polkit-gnome-devel >= 0.92
+- S: zenity
+- rel 2
+
 Revision 1.248  2009/10/23 13:45:03  megabajt
 - updated to 2.28.1
 
@@ -422,7 +434,7 @@
 - ver. 2.20.5
 
 Revision 1.223  2008-03-21 07:59:30  arekm
-R: xorg-app-xmodmap used in gdm/Xsession
+- R: xorg-app-xmodmap used in gdm/Xsession
 
 Revision 1.222  2008-03-13 11:15:13  patrys
 - 2.20.4

================================================================
Index: packages/gdm/gdm-custom.desktop
diff -u /dev/null packages/gdm/gdm-custom.desktop:1.1
--- /dev/null	Sun Nov 15 21:54:58 2009
+++ packages/gdm/gdm-custom.desktop	Sun Nov 15 21:54:52 2009
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=.xsession
+Comment=Run ~/.xsession script
+Exec=custom
+Icon=
+Type=Application
+# vi: encoding=utf-8

================================================================
Index: packages/gdm/gdm-default.desktop
diff -u /dev/null packages/gdm/gdm-default.desktop:1.1
--- /dev/null	Sun Nov 15 21:54:58 2009
+++ packages/gdm/gdm-default.desktop	Sun Nov 15 21:54:52 2009
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=.Xclients
+Comment=Run ~/.Xclients script
+Exec=default
+Icon=
+Type=Application
+# vi: encoding=utf-8
================================================================

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