SPECS (DEVEL): gdm.spec - 2.21.4

Thu Dec 20 01:22:57 CET 2007

Author: patrys                       Date: Thu Dec 20 00:22:57 2007 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 2.21.4

---- Files affected:
SPECS:
   gdm.spec (1.220 -> 1.220.2.1) 

---- Diffs:

================================================================
Index: SPECS/gdm.spec
diff -u SPECS/gdm.spec:1.220 SPECS/gdm.spec:1.220.2.1

--- SPECS/gdm.spec:1.220	Sat Dec  1 18:18:53 2007
+++ SPECS/gdm.spec	Thu Dec 20 01:22:52 2007
@@ -15,13 +15,13 @@
 Summary(ru.UTF-8):	Đ”Đ¸ŃĐżĐťĐľĐšĐ˝Ń‹Đš ĐźĐľĐ˝ĐľĐ´ĐśĐľŃ€ GNOME
 Summary(uk.UTF-8):	Đ”Đ¸ŃĐżĐťĐľĐšĐ˝Đ¸Đš ĐźĐľĐ˝ĐľĐ´ĐśĐľŃ€ GNOME
 Name:		gdm
-Version:	2.20.2
+Version:	2.21.4
 Release:	1
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5:	65b5319561ce8464e35750f9c3d594fa
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.21/%{name}-%{version}.tar.bz2
+# Source0-md5:	2fe013e31f44bd383c1f6f31a3977034
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -30,9 +30,8 @@
 # Source4-md5:	e293fbe4a60004056f6894463b874ae8
 Source5:	%{name}-autologin.pamd
 Patch0:		%{name}-xdmcp.patch
-Patch1:		%{name}-conf.patch
+Patch1:		%{name}-user.patch
 Patch2:		%{name}-xsession.patch
-Patch3:		%{name}-desktop.patch
 Patch4:		%{name}-defaults.patch
 URL:		http://www.gnome.org/projects/gdm/
 BuildRequires:	ConsoleKit-devel
@@ -150,7 +149,6 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 
 sed -i -e 's#sr at Latn#sr at latin#' po/LINGUAS
@@ -186,9 +184,6 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	PAM_PREFIX=/etc
 
-mv $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop \
-	$RPM_BUILD_ROOT%{_datadir}/xsessions
-
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
@@ -215,9 +210,13 @@
 %useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
 
 %post
+%gconf_schema_install gdm-simple-greeter.schemas
 %scrollkeeper_update_post
 %update_icon_cache hicolor
 
+%preun
+%gconf_schema_uninstall gdm-simple-greeter.schemas
+
 %postun
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
@@ -250,31 +249,26 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/gdm-dmx-reconnect-proxy
-%attr(755,root,root) %{_bindir}/gdmdynamic
-%attr(755,root,root) %{_bindir}/gdmflexiserver
-%attr(755,root,root) %{_bindir}/gdmphotosetup
-%attr(755,root,root) %{_bindir}/gdmthemetester
-%attr(755,root,root) %{_libdir}/gdmaskpass
-%attr(755,root,root) %{_libdir}/gdmopen
-%attr(755,root,root) %{_libdir}/gdmtranslate
-%attr(755,root,root) %{_libdir}/gdmchooser
-%attr(755,root,root) %{_libdir}/gdmgreeter
-%attr(755,root,root) %{_libdir}/gdmlogin
+%attr(755,root,root) %{_libexecdir}/gdm-factory-slave
+%attr(755,root,root) %{_libexecdir}/gdm-product-slave
+%attr(755,root,root) %{_libexecdir}/gdm-session-worker
+%attr(755,root,root) %{_libexecdir}/gdm-settings-daemon
+%attr(755,root,root) %{_libexecdir}/gdm-simple-chooser
+%attr(755,root,root) %{_libexecdir}/gdm-simple-greeter
+%attr(755,root,root) %{_libexecdir}/gdm-simple-slave
 %attr(755,root,root) %{_sbindir}/*
 %dir %{_sysconfdir}/gdm
-%dir %{_sysconfdir}/gdm/modules
+%dir %{_sysconfdir}/gdm/Init
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Init
 %attr(755,root,root) %config %{_sysconfdir}/gdm/PreSession
 %attr(755,root,root) %config %{_sysconfdir}/gdm/PostSession
-%attr(755,root,root) %config %{_sysconfdir}/gdm/XKeepsCrashing
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
+%dir %{_sysconfdir}/gdm/PostLogin
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
-%config %{_sysconfdir}/gdm/locale.alias
-%config %{_sysconfdir}/gdm/modules/*
-
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/
-
+%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/*
 %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(750,xdm,xdm) /var/lib/gdm
@@ -282,17 +276,18 @@
 %attr(750,xdm,xdm) /home/services/xdm
 %{_pixmapsdir}/*
 %{_datadir}/gdm
-#%%{_datadir}/xsessions  -  moved to gnome-session
-%{_datadir}/xsessions/default.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
-%{_iconsdir}/hicolor/*/apps/*.svg
-%attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
-%{_mandir}/man1/gdm*
+#%{_iconsdir}/hicolor/*/apps/*.svg
+%dir %{_libdir}/gdm
+%dir %{_libdir}/gdm/settings
+%dir %{_libdir}/gdm/settings/plugins
+%attr(755,root,root) %{_libdir}/gdm/settings/plugins/lib*.so
+%{_libdir}/gdm/settings/plugins/*-plugin
 
 %files Xnest
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gdmXnest
-%attr(755,root,root) %{_bindir}/gdmXnestchooser
+#%attr(755,root,root) %{_bindir}/gdmXnest
+#%attr(755,root,root) %{_bindir}/gdmXnestchooser
 
 %files init
 %defattr(644,root,root,755)
@@ -304,6 +299,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.220.2.1  2007-12-20 00:22:52  patrys
+- 2.21.4
+
 Revision 1.220  2007-12-01 17:18:53  glen
 - @ is no special needing the escape
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gdm.spec?r1=1.220&r2=1.220.2.1&f=u

