- firstVT=9 in config file

[packages/gdm2.20.git] / gdm2.20.spec

diff --git a/gdm2.20.spec b/gdm2.20.spec
index a51b24aacd55c6fb5ac2e08d80826a2779b50cea..05440e6155629a35761cfacc4fc7335a71bb13bb 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -3,6 +3,9 @@
 # s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2
 # check /etc/pam.d/gdm-autologin
 #
+# Conditiional build:
+%bcond_without selinux # without selinux
+#
 Summary:       GNOME Display Manager
 Summary(es):   Administrador de Entrada del GNOME
 Summary(ja):   GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
@@ -11,19 +14,20 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.6.0.5
-Release:       3
+Version:       2.6.0.8
+Release:       2
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 8fad6d36c0c9b8f83fceb947b3de1c31
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 2c51b452686378097bb58e5fc02e2d04
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
 # http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-artwork/gdm/storky/
 Source4:       %{name}-storky.tar.gz
 # Source4-md5: e293fbe4a60004056f6894463b874ae8
+Source5:       %{name}-autologin.pamd
 Patch0:                %{name}-xdmcp.patch
 Patch1:                %{name}-conf.patch
 Patch2:                %{name}-xsession.patch
@@ -37,13 +41,13 @@ BuildRequires:      automake
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 2:2.4.3
 BuildRequires: intltool >= 0.30
-BuildRequires: libglade2-devel >= 1:2.4.0
+BuildRequires: libglade2-devel >= 1:2.4.1
 BuildRequires: libgnome-devel >= 2.6.1
 BuildRequires: libgnomecanvas-devel >= 2.6.1
-BuildRequires: libgnomeui-devel >= 2.6.1
+BuildRequires: libgnomeui-devel >= 2.10.0-2
 BuildRequires: libgsf-devel >= 1.9.0
 BuildRequires: librsvg-devel >= 1:2.6.5
-BuildRequires: libselinux-devel
+%{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
@@ -63,6 +67,7 @@ Requires:     pam >= 0.77.3-7
 Provides:      group(xdm)
 Provides:      user(xdm)
 Obsoletes:     X11-xdm
+Obsoletes:     entrance
 Obsoletes:     kdm
 Obsoletes:     wdm
 Obsoletes:     xdm
@@ -158,7 +163,7 @@ intltoolize --copy --force
        --with-tcp-wrappers=yes \
        --enable-authentication-scheme=pam \
        --disable-console-helper \
-       --with-selinux
+       --with%{!?with_selinux:out}-selinux
 
 %{__make}
 
@@ -175,6 +180,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
 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
 
 install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}