SPECS: gdm.spec - merged from DEVEL

Sun Apr 2 17:36:50 CEST 2006

Author: freetz                       Date: Sun Apr  2 15:36:50 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   gdm.spec (1.172 -> 1.173) 

---- Diffs:

================================================================
Index: SPECS/gdm.spec
diff -u SPECS/gdm.spec:1.172 SPECS/gdm.spec:1.173

--- SPECS/gdm.spec:1.172	Mon Nov 28 22:50:34 2005
+++ SPECS/gdm.spec	Sun Apr  2 17:36:45 2006
@@ -15,13 +15,13 @@
 Summary(ru):	äÉÓĐĚĹĘÎŮĘ ÍĹÎĹÄÖĹŇ GNOME
 Summary(uk):	äÉÓĐĚĹĘÎÉĘ ÍĹÎĹÄÖĹŇ GNOME
 Name:		gdm
-Version:	2.8.0.7
-Release:	1
+Version:	2.14.0
+Release:	2
 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:	566a1e3d656b6b536414f287ead2db7e
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/%{name}-%{version}.tar.bz2
+# Source0-md5:	1f82485c4e8cd8ca2f1523a91a624eff
 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
@@ -55,6 +54,10 @@
 BuildRequires:	pam-devel
 BuildRequires:	perl-modules
 BuildRequires:	rpmbuild(macros) >= 1.231
+BuildRequires:	xorg-lib-libdmx-devel
+BuildRequires:	xorg-lib-libXdmcp-devel
+BuildRequires:	xorg-lib-libXi-devel
+BuildRequires:	xorg-lib-libXinerama-devel
 Requires(pre):	/bin/id
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
@@ -62,7 +65,7 @@
 Requires(postun):	/usr/sbin/userdel
 Requires(post,postun):	/usr/bin/scrollkeeper-update
 Requires:	libgnome >= 2.6.1
-Requires:	sessreg
+Requires:	xorg-app-sessreg
 Requires:	which
 Requires:	pam >= 0.79.0
 Provides:	group(xdm)
@@ -75,7 +78,6 @@
 Conflicts:	gdkxft
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/X11
 %define		_localstatedir	/var/lib
 
 %description
@@ -118,7 +120,7 @@
 Summary(pl):	Serwer Xnest dla GDM
 Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	XFree86-Xnest
+Requires:	xorg-xserver-Xnest
 
 %description Xnest
 This package add support for Xnest server in gdm.
@@ -148,7 +150,6 @@
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -158,13 +159,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 +180,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
@@ -217,6 +220,11 @@
 	%groupremove xdm
 fi
 
+%triggerpostun -- %{name} < 1:2.13.0.8-1
+if [ -f /etc/X11/gdm/gdm.conf-custom.rpmsave ]; then
+    mv /etc/X11/gdm/gdm.conf-custom.rpmsave /etc/gdm/custom.conf
+fi
+
 %post init
 /sbin/chkconfig --add gdm
 if [ -f /var/lock/subsys/gdm ]; then
@@ -256,12 +264,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
@@ -295,6 +303,33 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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
 
================================================================

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

