SPECS (AC-branch): gdm.spec - merged from HEAD

Mon May 15 16:05:52 CEST 2006

Author: baggins                      Date: Mon May 15 14:05:52 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   gdm.spec (1.170.2.1 -> 1.170.2.2) 

---- Diffs:

================================================================
Index: SPECS/gdm.spec
diff -u SPECS/gdm.spec:1.170.2.1 SPECS/gdm.spec:1.170.2.2

--- SPECS/gdm.spec:1.170.2.1	Fri Apr 14 17:01:33 2006
+++ SPECS/gdm.spec	Mon May 15 16:05:46 2006
@@ -15,13 +15,13 @@
 Summary(ru):	äÉÓĐĚĹĘÎŮĘ ÍĹÎĹÄÖĹŇ GNOME
 Summary(uk):	äÉÓĐĚĹĘÎÉĘ ÍĹÎĹÄÖĹŇ GNOME
 Name:		gdm
-Version:	2.8.0.6
-Release:	2
+Version:	2.14.5
+Release:	1
 Epoch:		1
 License:	GPL/LGPL
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.8/%{name}-%{version}.tar.bz2
-# Source0-md5:	6be27ec9f4783abaf1e087e3020e74fa
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	d857a56eec8aeb02342da4a36a311021
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -33,9 +33,8 @@
 Patch1:		%{name}-conf.patch
 Patch2:		%{name}-xsession.patch
 Patch3:		%{name}-logdir.patch
-Patch4:		%{name}-default_theme.patch
-Patch5:		%{name}-desktop.patch
-Patch6:		%{name}-vt_9.patch
+Patch4:		%{name}-desktop.patch
+Patch5:		%{name}-xorg.patch
 URL:		http://www.jirka.org/gdm.html
 BuildRequires:	attr-devel
 BuildRequires:	autoconf
@@ -44,9 +43,9 @@
 BuildRequires:	gtk+2-devel >= 2:2.4.3
 BuildRequires:	intltool >= 0.30
 BuildRequires:	libglade2-devel >= 1:2.4.1
-BuildRequires:	libgnome-devel >= 2.6.1
-BuildRequires:	libgnomecanvas-devel >= 2.6.1
-BuildRequires:	libgnomeui-devel >= 2.10.0-2
+BuildRequires:	libgnome-devel >= 2.14.1
+BuildRequires:	libgnomecanvas-devel >= 2.14.0
+BuildRequires:	libgnomeui-devel >= 2.14.1
 BuildRequires:	libgsf-devel >= 1.9.0
 BuildRequires:	librsvg-devel >= 1:2.6.5
 %{?with_selinux:BuildRequires:	libselinux-devel}
@@ -148,7 +147,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -158,13 +156,14 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--with-xinerama=yes \
-	--with-xdmcp=yes \
+	--disable-console-helper \
+	--disable-scrollkeeper \
+	--enable-authentication-scheme=pam \
 	--with-pam-prefix=/etc \
 	--with-tcp-wrappers=yes \
-	--enable-authentication-scheme=pam \
-	--disable-console-helper \
-	--with%{!?with_selinux:out}-selinux
+	--with%{!?with_selinux:out}-selinux \
+	--with-xdmcp=yes \
+	--with-xinerama=yes
 
 %{__make}
 
@@ -178,7 +177,8 @@
 	DESTDIR=$RPM_BUILD_ROOT \
 	PAM_PREFIX=/etc
 
-mv $RPM_BUILD_ROOT%{_datadir}/gdm/BuiltInSessions/default.desktop $RPM_BUILD_ROOT%{_datadir}/xsessions
+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
@@ -190,8 +190,6 @@
 
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
-rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
-
 %find_lang %{name} --all-name --with-gnome
 
 # Remove useless files
@@ -254,12 +252,12 @@
 %attr(755,root,root) %config %{_sysconfdir}/gdm/PostSession
 %attr(755,root,root) %config %{_sysconfdir}/gdm/XKeepsCrashing
 %attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
-%config %{_sysconfdir}/gdm/factory-gdm.conf
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
+%config %{_sysconfdir}/gdm/locale.alias
 %config %{_sysconfdir}/gdm/modules/*
 
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/gdm.conf
-%config %{_sysconfdir}/gdm/locale.alias
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gdm/
+
 %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
@@ -293,11 +291,64 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.170.2.2  2006/05/15 14:05:46  baggins
+- merged from HEAD
+
 Revision 1.170.2.1  2006/04/14 15:01:33  glen
 - rel 2, rebuild with updated macros
 
+Revision 1.178  2006/05/10 20:17:40  freetz
+- 2.14.5
+
+Revision 1.177  2006/04/28 16:42:36  freetz
+- 2.14.4
+
+Revision 1.176  2006/04/25 16:21:03  freetz
+- 2.14.3
+
+Revision 1.175  2006/04/16 12:58:09  freetz
+- 2.14.2, removed gdm-gdmthemetester.in gdm-makefile.patch (already
+  included)
+
+Revision 1.174  2006/04/12 16:11:18  freetz
+- 2.14.1, added makefile patch and source missing from tarball to fix
+  mess introduced with this release
+
+Revision 1.173  2006/04/02 15:36:45  freetz
+- merged from DEVEL
+
+Revision 1.172.2.7  2006/03/19 18:10:51  wrobell
+- added patch to always find X in /usr (modular xorg)
+- rel. 2
+
+Revision 1.172.2.6  2006/03/14 07:01:10  freetz
+- 2.14.0
+
+Revision 1.172.2.5  2006/03/03 23:01:18  freetz
+- 2.13.0.10
+
+Revision 1.172.2.4  2006/02/27 22:04:07  freetz
+- 2.13.0.9
+
+Revision 1.172.2.3  2006/02/21 12:16:13  wiget
+- more BRs
+- relase 2
+
+Revision 1.172.2.2  2006/02/17 14:23:52  freetz
+- 2.13.0.8, configraution moved to /etc/gdm, added trigger
+
+Revision 1.172.2.1  2006/02/10 08:39:31  freetz
+- 2.13.0.7, vt_9, logdir, default_theme patches incorporated into conf
+  patch, switched to modular xorg
+
+Revision 1.172  2005/11/28 21:50:34  freetz
+- 2.8.0.7
+
+Revision 1.171  2005/11/16 21:46:58  qboosh
+- fixed version number in previous changelog entry
+
 Revision 1.170  2005/11/15 22:02:58  freetz
-- 2.8.0.
+- 2.8.0.6
 
 Revision 1.169  2005/10/19 18:44:35  freetz
 - don't restart on upgrade, rel.2
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gdm.spec?r1=1.170.2.1&r2=1.170.2.2&f=u

