SPECS: gdm.spec - merged from DEVEL, up to 2.20

[aflinta]

Author: aflinta                      Date: Tue Sep 18 08:23:20 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL, up to 2.20

---- Files affected:
SPECS:
   gdm.spec (1.211 -> 1.212) 

---- Diffs:

================================================================
Index: SPECS/gdm.spec
diff -u SPECS/gdm.spec:1.211 SPECS/gdm.spec:1.212
--- SPECS/gdm.spec:1.211	Sun Sep  9 19:21:00 2007
+++ SPECS/gdm.spec	Tue Sep 18 10:23:15 2007
@@ -16,13 +16,13 @@
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	2.18.4
+Version:	2.20.0
 Release:	1
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5:	53e5f5820fa67abf55c37ea7570807b7
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/%{name}-%{version}.tar.bz2
+# Source0-md5:	cf374113a1f837b0df916572625b5078
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -33,26 +33,24 @@
 Patch0:		%{name}-xdmcp.patch
 Patch1:		%{name}-conf.patch
 Patch2:		%{name}-xsession.patch
-Patch3:		%{name}-logdir.patch
 Patch4:		%{name}-desktop.patch
-Patch5:		%{name}-xorg.patch
-Patch6:		%{name}-sessreg.patch
 URL:		http://www.jirka.org/gdm.html
+BuildRequires:	ConsoleKit-devel
 BuildRequires:	attr-devel
 BuildRequires:	autoconf >= 2.52
 BuildRequires:	automake
 BuildRequires:	dbus-glib-devel >= 0.73
 BuildRequires:	gettext-devel
-BuildRequires:	gtk+2-devel >= 2:2.10.10
-BuildRequires:	intltool >= 0.35.5
+BuildRequires:	gtk+2-devel >= 2:2.10.14
+BuildRequires:	intltool >= 0.36.1
 BuildRequires:	libart_lgpl-devel >= 2.3.19
-BuildRequires:	libglade2-devel >= 1:2.6.0
-BuildRequires:	libgnomeui-devel >= 2.18.1
-BuildRequires:	libgsf-devel >= 1.14.2
-BuildRequires:	librsvg-devel >= 1:2.16.1
+BuildRequires:	libglade2-devel >= 1:2.6.2
+BuildRequires:	libgnomeui-devel >= 2.19.1
+BuildRequires:	libgsf-devel >= 1.14.6
+BuildRequires:	librsvg-devel >= 1:2.18.1
 %{?with_selinux:BuildRequires:	libselinux-devel}
 BuildRequires:	libtool
-BuildRequires:	libxml2-devel >= 1:2.6.27
+BuildRequires:	libxml2-devel >= 1:2.6.29
 BuildRequires:	pam-devel
 BuildRequires:	perl-modules
 BuildRequires:	rpmbuild(macros) >= 1.268
@@ -69,7 +67,7 @@
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Requires:	libgnomeui >= 2.18.1
+Requires:	libgnomeui >= 2.19.1
 Requires:	pam >= 0.99.7.1
 Requires:	which
 Requires:	xorg-app-sessreg
@@ -148,10 +146,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -277,9 +272,6 @@
 %attr(750,xdm,xdm) /var/log/gdm
 %attr(750,xdm,xdm) /home/services/xdm
 %{_pixmapsdir}/*
-%{_desktopdir}/gdmsetup.desktop
-%{_desktopdir}/gdmflexiserver.desktop
-%{_desktopdir}/gdmphotosetup.desktop
 %{_datadir}/gdm
 #%%{_datadir}/xsessions  -  moved to gnome-session
 %{_datadir}/xsessions/default.desktop
@@ -292,7 +284,6 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/gdmXnest
 %attr(755,root,root) %{_bindir}/gdmXnestchooser
-%{_desktopdir}/gdmflexiserver-xnest.desktop
 
 %files init
 %defattr(644,root,root,755)
@@ -304,9 +295,21 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.212  2007/09/18 08:23:15  aflinta
+- merged from DEVEL, up to 2.20
+
 Revision 1.211  2007/09/09 17:21:00  qboosh
 - let all XDMs have Provides: XDM (xdm was already used by XFree86 xdm impl.)
 - dropped X11-xdm obsoletes from non-X.org XDMs
+
+Revision 1.210.2.3  2007/09/17 11:51:36  patrys
+- build with ConsoleKit support
+
+Revision 1.210.2.2  2007/09/07 19:17:55  megabajt
+- updated to 2.19.8
+
+Revision 1.210.2.1  2007/08/29 05:32:49  patrys
+- 2.19.7
 
 Revision 1.210  2007/08/13 14:17:14  megabajt
 - updated to 2.18.4, fixes CVE-2007-3381
================================================================

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