This commit was manufactured by cvs2git to create branch 'DEVEL'.

Sprout from master 2007-12-20 00:17:11 UTC Patryk Zawadzki <patrys@room-303.com> '- use xdm instead of gdm'
Delete:
    gdm-conf.patch
    gdm-defaults.patch
    gdm-logdir.patch
    gdm-sessreg.patch
    gdm-xdmcp.patch
    gdm-xorg.patch
    gdm-xsession.patch
    gdm.init
    gdm.spec

diff --git a/gdm-conf.patch b/gdm-conf.patch
deleted file mode 100644 (file)
index c35ab44..0000000
--- a/gdm-conf.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -urN gdm-2.20.2/config/gdm.conf.in gdm-2.20.2.new/config/gdm.conf.in
---- gdm-2.20.2/config/gdm.conf.in      2007-11-27 00:12:31.000000000 +0100
-+++ gdm-2.20.2.new/config/gdm.conf.in  2007-12-01 17:25:46.000000000 +0100
-@@ -99,8 +99,8 @@
- # User and group used for running GDM GUI applications.  By default this is set
- # to user "gdm" and group "gdm".  This user/group should have very limited
- # permissions and access to only the gdm directories and files.
--User=gdm
--Group=gdm
-+User=xdm
-+Group=xdm
- 
- # To try to kill all clients started at greeter time or in the Init script.
- # does not always work, only if those clients have a window of their own.
-@@ -202,7 +202,7 @@
- # Automatic VT allocation.  Right now only works on Linux.  This way we force
- # X to use specific vts.  Turn VTAllocation to false if this is causing
- # problems.
--#FirstVT=7
-+FirstVT=9
- #VTAllocation=true
- # Should double login be treated with a warning (and possibility to change VT's
- # on Linux and FreeBSD systems for console logins)
-@@ -397,7 +397,7 @@
- # User ID's less than the MinimalUID value will not be included in the face
- # browser or in the gdmselection list for Automatic/Timed login.  They will not
- # be displayed regardless of the settings for Include and Exclude.
--#MinimalUID=100
-+MinimalUID=1000
- # Users listed in Include will be included in the face browser and in the
- # gdmsetup selection list for Automatic/Timed login.  Users should be separated
- # by commas.
-@@ -512,7 +512,7 @@
- # list then provide a list that is delimited by /: to the GraphicalThemes
- # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
- # and specify just one theme.
--#GraphicalTheme=circles
-+GraphicalTheme=storky
- #GraphicalThemes=circles/:happygnome
- GraphicalThemeDir=@datadir@/gdm/themes/
- GraphicalThemeRand=false

diff --git a/gdm-defaults.patch b/gdm-defaults.patch
deleted file mode 100644 (file)
index aca7a7b..0000000
--- a/gdm-defaults.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -urN gdm-2.20.0/configure.ac gdm-2.20.0.new/configure.ac
---- gdm-2.20.0/configure.ac    2007-09-17 16:46:22.000000000 +0200
-+++ gdm-2.20.0.new/configure.ac        2007-09-21 17:29:32.000000000 +0200
-@@ -1201,10 +1201,9 @@
- else
-    # what to do, what to do, this is wrong, but this just sets the
-    # defaults, perhaps this user is cross compiling or some such
--   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
-+   X_PATH="/usr/bin"
-+   X_SERVER_PATH="/usr/bin"
-+   X_SERVER="/usr/bin/Xorg"
-    X_CONFIG_OPTIONS="-audit 0"
- fi
- 

diff --git a/gdm-logdir.patch b/gdm-logdir.patch
deleted file mode 100644 (file)
index c95c29c..0000000
--- a/gdm-logdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aurN gdm-2.14.1.orig/config/Makefile.am gdm-2.14.1/config/Makefile.am
---- gdm-2.14.1.orig/config/Makefile.am 2006-03-29 01:43:20.000000000 +0200
-+++ gdm-2.14.1/config/Makefile.am      2006-04-12 17:38:22.703380096 +0200
-@@ -5,7 +5,7 @@
- instsessdir = $(datadir)/xsessions
- initdir = $(gdmconfdir)/Init
- authdir = $(localstatedir)/gdm
--logdir = $(localstatedir)/log/gdm
-+logdir = /var/log/gdm
- gnomercdir = $(gdmconfdir)
- postdir = $(gdmconfdir)/PostSession
- predir = $(gdmconfdir)/PreSession
-diff -aurN gdm-2.14.1.orig/configure.ac gdm-2.14.1/configure.ac
---- gdm-2.14.1.orig/configure.ac       2006-04-10 22:08:15.000000000 +0200
-+++ gdm-2.14.1/configure.ac    2006-04-12 17:39:15.822304792 +0200
-@@ -793,7 +793,7 @@
- #
- AC_SUBST(authdir, ${localstatedir}/gdm)
- AC_SUBST(gdmlocaledir, ${gdmconfdir})
--AC_SUBST(logdir, ${localstatedir}/log/gdm)
-+AC_SUBST(logdir, /var/log/gdm)
- AC_SUBST(pixmapdir, ${datadir}/pixmaps)
- 
- withval=""

diff --git a/gdm-sessreg.patch b/gdm-sessreg.patch
deleted file mode 100644 (file)
index 479ff1d..0000000
--- a/gdm-sessreg.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- gdm-2.14.10/config/PostSession.in~ 2005-02-03 23:57:45.000000000 +0100
-+++ gdm-2.14.10/config/PostSession.in  2006-12-18 17:14:41.000000000 +0100
-@@ -21,6 +21,6 @@
- 
- SESSREG=`gdmwhich sessreg`
- if [ "x$SESSREG" != "x" ] ; then
--      "$SESSREG" -d -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER"
-+      "$SESSREG" -d -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER"
- fi
- exit 0
---- gdm-2.14.10/config/PreSession.in~  2006-05-12 07:58:21.000000000 +0200
-+++ gdm-2.14.10/config/PreSession.in   2006-12-18 17:14:20.000000000 +0100
-@@ -73,9 +73,9 @@
- if [ "x$SESSREG" != "x" ] ; then
-       # some output for easy debugging
-       echo "$0: Registering your session with wtmp and utmp"
--      echo "$0: running: $SESSREG -a -w /var/log/wtmp -u /var/run/utmp -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l \"$DISPLAY\" \"$USER\""
-+      echo "$0: running: $SESSREG -a -x \"$X_SERVERS\" -h \"$REMOTE_HOST\" -l \"$DISPLAY\" \"$USER\""
- 
--      exec "$SESSREG" -a -w /var/log/wtmp -u /var/run/utmp -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER"
-+      exec "$SESSREG" -a -x "$X_SERVERS" -h "$REMOTE_HOST" -l "$DISPLAY" "$USER"
-       # this is not reached
- fi
- 

diff --git a/gdm-xdmcp.patch b/gdm-xdmcp.patch
deleted file mode 100644 (file)
index 06ed096..0000000
--- a/gdm-xdmcp.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN gdm-2.13.0.7.orig/daemon/server.c gdm-2.13.0.7/daemon/server.c
---- gdm-2.13.0.7.orig/daemon/server.c  2006-01-19 00:32:50.000000000 +0100
-+++ gdm-2.13.0.7/daemon/server.c       2006-02-05 17:12:06.557522000 +0100
-@@ -1150,7 +1150,7 @@
-         /* Log all output from spawned programs to a file */
-       logfile = gdm_make_filename (gdm_get_value_string (GDM_KEY_LOG_DIR), d->name, ".log");
-       VE_IGNORE_EINTR (g_unlink (logfile));
--      VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0644));
-+      VE_IGNORE_EINTR (logfd = open (logfile, O_CREAT|O_TRUNC|O_WRONLY|O_EXCL, 0640));
- 
-       if (logfd != -1) {
-               VE_IGNORE_EINTR (dup2 (logfd, 1));

diff --git a/gdm-xorg.patch b/gdm-xorg.patch
deleted file mode 100644 (file)
index 78dc0dc..0000000
--- a/gdm-xorg.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -aurN gdm-2.15.9.orig/configure.ac gdm-2.15.9/configure.ac
---- gdm-2.15.9.orig/configure.ac       2006-08-07 21:56:22.000000000 +0200
-+++ gdm-2.15.9/configure.ac    2006-08-09 22:21:36.737065346 +0200
-@@ -965,67 +965,10 @@
-         ;;
- esac
- 
--# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
--# symlink to each other, and configure should use the more stable
--# location (the real directory) if possible.
--#
--if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
--   X_PATH="/usr/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
--   X_PATH="/usr/X11/bin"
--   X_SERVER_PATH="/usr/X11/bin"
--   X_SERVER="/usr/X11/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/X11R6/bin/X; then
--   X_PATH="/usr/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/bin/Xorg; then
--   X_PATH="/usr/bin"
--   X_SERVER_PATH="/usr/bin"
--   X_SERVER="/usr/bin/Xorg"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/X11/bin/X; then
--   X_PATH="/usr/X11/bin"
--   X_SERVER_PATH="/usr/X11/bin"
--   X_SERVER="/usr/X11/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
--   X_CONFIG_OPTIONS="-audit 0"
--elif test -x /usr/openwin/bin/Xsun; then
--   # Do not add /usr/openwin/bin here because on Solaris you need 
--   # /usr/openwin/bin in your PATH even if you are using the Xorg
--   # Xserver.  We add this to the path below.
--   X_PATH="/usr/openwin/bin"
--   X_SERVER_PATH="/usr/openwin/bin"
--   X_SERVER="/usr/openwin/bin/Xsun"
--   X_CONFIG_OPTIONS="-audit 0 -nobanner"
--elif test -x /opt/X11R6/bin/X; then
--   X_PATH="/opt/X11R6/bin"
--   X_SERVER_PATH="/opt/X11R6/bin"
--   X_SERVER="/opt/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
--   X_CONFIG_OPTIONS="-audit 0"   
--elif test -x /usr/bin/X; then
--   X_PATH="/usr/bin"
--   X_SERVER_PATH="/usr/bin"
--   X_SERVER="/usr/bin/X"
--   X_CONFIG_OPTIONS="-audit 0"
--else
--   # what to do, what to do, this is wrong, but this just sets the
--   # defaults, perhaps this user is cross compiling or some such
--   X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
--   X_SERVER_PATH="/usr/X11R6/bin"
--   X_SERVER="/usr/X11R6/bin/X"
--   GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
--   X_CONFIG_OPTIONS="-audit 0"
--fi
-+X_PATH="/usr/bin"
-+X_SERVER_PATH="/usr/bin"
-+X_SERVER="/usr/bin/X"
-+X_CONFIG_OPTIONS="-audit 0"
- 
- # Don't add bindir to GDM_USER_PATH if it is already in the PATH.
- # If it is /bin or /usr/bin, for example.

diff --git a/gdm-xsession.patch b/gdm-xsession.patch
deleted file mode 100644 (file)
index a5447ca..0000000
--- a/gdm-xsession.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urN gdm-2.6.0.3.orig/config/Xsession.in gdm-2.6.0.3/config/Xsession.in
---- gdm-2.6.0.3.orig/config/Xsession.in        2004-05-28 21:50:17.000000000 +0200
-+++ gdm-2.6.0.3/config/Xsession.in     2004-07-09 15:07:16.039478016 +0200
-@@ -35,6 +35,10 @@
- test -f /etc/xprofile && . /etc/xprofile
- test -f "$HOME/.xprofile" && . "$HOME/.xprofile"
- 
-+if [ ! -f $HOME/.profile ] && echo $SHELL |grep -q "bash"; then
-+    test -f $HOME/.bash_profile && . $HOME/.bash_profile
-+fi
-+
- # Translation stuff
- if [ -x "@EXPANDED_LIBEXECDIR@/gdmtranslate" ] ; then
-   gdmtranslate="@EXPANDED_LIBEXECDIR@/gdmtranslate"
-@@ -222,6 +226,23 @@
-   fi
- fi
- 
-+# Keep in sync with Xclients from xinitrc-ng 
-+syswmfile="/etc/sysconfig/desktop"
-+
-+# In this file "$wmstyledir" value may be given
-+[ -f "$syswmfile" ] && . $syswmfile
-+
-+if [ -z "$wmstyledir" ]; then
-+    # Keep in sync with Xclients from xinitrc-ng 
-+    wmstyledir="/etc/sysconfig/wmstyle"
-+fi
-+
-+if [ -x "$HOME/bin/$command.sh" ]; then
-+    command="$HOME/bin/$command.sh"
-+elif [ -x "$wmstyledir/$command.sh" ]; then
-+    command="$wmstyledir/$command.sh"
-+fi
-+
- # add ssh-agent if found
- sshagent="`gdmwhich ssh-agent`"
- if [ -n "$sshagent" ] && [ -x "$sshagent" ] && [ -z "$SSH_AUTH_SOCK" ]; then

diff --git a/gdm.init b/gdm.init
deleted file mode 100644 (file)
index 629f903..0000000
--- a/gdm.init
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-#
-# gdm:         Starts the Gnome Display Manager
-#
-# Version:     @(#) /etc/rc.d/init.d/gdm 0.1
-#
-# chkconfig:   5 95 05
-# description: Starts and stops the Gnome Display Manager at startup and \
-#              shutdown..
-#
-# config:      /etc/X11/gdm/gdm-config
-# probe:       true
-# hide:                true
-
-. /etc/rc.d/init.d/functions
-
-# Get service config
-if [ -f /etc/sysconfig/gdm ]; then
-       . /etc/sysconfig/gdm
-fi
-
-RETVAL=0
-# See how we were called.
-case "$1" in
-  start)
-       # Check if the service is already running?
-       if [ ! -f /var/lock/subsys/gdm ]; then
-               msg_starting "Gnome Display Manager"
-               daemon /usr/sbin/gdm
-               RETVAL=$?
-               [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gdm
-       else
-               msg_already_running "Gnome Display Manager"
-       fi
-       ;;
-  stop)
-       if [ -f /var/lock/subsys/gdm ]; then
-               msg_stopping "Gnome Display Manager"
-               killproc gdm
-               rm -f /var/lock/subsys/gdm
-       else
-               msg_not_running "Gnome Display Manager"
-       fi
-       ;;
-  status)
-       status gdm gdm-binary
-       exit $?
-       ;;
-  restart|force-reload)
-       $0 stop
-       $0 start
-       exit $?
-       ;;
-  *)
-       msg_usage "$0 {start|stop|restart|force-reload|status}"
-       exit 3
-esac
-
-exit $RETVAL

diff --git a/gdm.spec b/gdm.spec
deleted file mode 100644 (file)
index ad406c6..0000000
--- a/gdm.spec
+++ /dev/null
@@ -1,298 +0,0 @@
-#
-# TODO:
-# - s=/dev/null=/home/services/xdm= in %%trigger for graceful 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.UTF-8):     Administrador de Entrada del GNOME
-Summary(ja.UTF-8):     GNOME ディスプレイマネージャ
-Summary(pl.UTF-8):     gdm - zarządca ekranów GNOME
-Summary(pt_BR.UTF-8):  Gerenciador de Entrada do GNOME
-Summary(ru.UTF-8):     Дисплейный менеджер GNOME
-Summary(uk.UTF-8):     Дисплейний менеджер GNOME
-Name:          gdm
-Version:       2.20.2
-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
-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
-Patch3:                %{name}-desktop.patch
-Patch4:                %{name}-defaults.patch
-URL:           http://www.gnome.org/projects/gdm/
-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.12.0
-BuildRequires: intltool >= 0.36.1
-BuildRequires: libart_lgpl-devel >= 2.3.19
-BuildRequires: libglade2-devel >= 1:2.6.2
-BuildRequires: libgnomeui-devel >= 2.20.0
-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.29
-BuildRequires: pam-devel
-BuildRequires: perl-modules
-BuildRequires: rpmbuild(find_lang) >= 1.23
-BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: scrollkeeper
-BuildRequires: sed >= 4.0
-BuildRequires: xorg-lib-libXdmcp-devel
-BuildRequires: xorg-lib-libXi-devel
-BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libdmx-devel
-Requires(post,postun): gtk+2
-Requires(post,postun): hicolor-icon-theme
-Requires(post,postun): /usr/bin/scrollkeeper-update
-Requires(postun):      /usr/sbin/groupdel
-Requires(postun):      /usr/sbin/userdel
-Requires(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
-Requires:      libgnomeui >= 2.20.0
-Requires:      pam >= 0.99.7.1
-Requires:      which
-Requires:      xorg-app-sessreg
-Provides:      XDM
-Provides:      group(xdm)
-Provides:      user(xdm)
-Conflicts:     gdkxft
-# sr@Latn vs. sr@latin
-Conflicts:     glibc-misc < 6:2.7
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-
-%define                _localstatedir  /var/lib
-
-%description
-Gdm (the GNOME Display Manager) is a highly configurable
-reimplementation of xdm, the X Display Manager. Gdm allows you to log
-into your system with the X Window System running and supports running
-several different X sessions on your local machine at the same time.
-
-%description -l es.UTF-8
-Administrador de Entrada del GNOME.
-
-%description -l ja.UTF-8
-Gdm (the GNOME Display Manager) は、高度に設定可能な xdm X Display
-Manager の再実装版です。 Gdm を使うと、 X Window System
-が動いているあなたの
-システムにいろいろなセッションを選択してログインすることができます。
-
-このバージョンの Gdm では、各種言語や、XIM を選択することも可能です。
-
-%description -l pl.UTF-8
-Gdm jest wysokokonfigurowalną reimplementacją xdma. Gdm pozwala
-logować się do systemu z poziomu X11 i wspiera jednoczesną pracę kilku
-różnych sesji X na lokalnej maszynie.
-
-%description -l pt_BR.UTF-8
-Gerenciador de Entrada do GNOME.
-
-%description -l ru.UTF-8
-GDM (GNOME Display Manager) - это реимплементация xdm (X Display
-Manager). GDM позволяет вам входить в систему, на которой запущено X
-Window и поддерживает работу нескольуих разных X сеансов одновременно.
-
-%description -l uk.UTF-8
-GDM (GNOME Display Manager) - це реімплементація xdm (X Display
-Manager). GDM дозволяє вам входити в систему, на якій запущено X
-Window та підтримує роботу кількох різних X сеансів одночасно.
-
-%package Xnest
-Summary:       Xnest (ie embedded X) server for GDM
-Summary(pl.UTF-8):     Serwer Xnest dla GDM
-Group:         X11/Applications
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      xorg-xserver-Xnest
-
-%description Xnest
-This package add support for Xnest server in gdm.
-
-%description Xnest -l pl.UTF-8
-Ten pakiet dodaje do gdm wsparcie dla Xnest.
-
-%package init
-Summary:       Init script for GDM
-Summary(pl.UTF-8):     Skrypt init dla GDM-a
-Group:         X11/Applications
-Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      open
-
-%description init
-Init script for GDM.
-
-%description init -l pl.UTF-8
-Skrypt init dla GDM-a.
-
-%prep
-%setup -q -a4
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
-mv po/sr@{Latn,latin}.po
-
-%build
-%{__libtoolize}
-%{__glib_gettextize}
-%{__intltoolize}
-%{__aclocal}
-%{__autoconf}
-%{__automake}
-%configure \
-       --disable-console-helper \
-       --disable-scrollkeeper \
-       --with-console-kit \
-       --enable-authentication-scheme=pam \
-       --with-pam-prefix=/etc \
-       --with-tcp-wrappers=yes \
-       --with%{!?with_selinux:out}-selinux \
-       --with-xdmcp=yes \
-       --with-xinerama=yes
-
-%{__make}
-
-%install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
-       $RPM_BUILD_ROOT{/home/services/xdm,/var/log/gdm} \
-       $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky
-
-%{__make} install \
-       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
-
-install %{SOURCE3} $RPM_BUILD_ROOT%{_pixmapsdir}
-
-install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
-
-touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
-
-%find_lang %{name} --with-gnome --with-omf --all-name
-
-# Remove useless files
-rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
-
-# moved to gnome-session
-rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%pre
-%groupadd -g 55 -r -f xdm
-%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
-
-%post
-%scrollkeeper_update_post
-%update_icon_cache hicolor
-
-%postun
-%scrollkeeper_update_postun
-%update_icon_cache hicolor
-
-if [ "$1" = "0" ]; then
-       %userremove xdm
-       %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
-       echo "Run \"/sbin/service gdm restart\" to restart gdm." >&2
-       echo "WARNING: it will terminate all sessions opened from gdm!" >&2
-else
-       echo "Run \"/sbin/service gdm start\" to start gdm." >&2
-fi
-
-%preun init
-if [ "$1" = "0" ]; then
-       %service gdm stop
-       /sbin/chkconfig --del gdm
-fi
-
-%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) %{_sbindir}/*
-%dir %{_sysconfdir}/gdm
-%dir %{_sysconfdir}/gdm/modules
-%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
-%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) /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
-%attr(750,xdm,xdm) /var/log/gdm
-%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*
-
-%files Xnest
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gdmXnest
-%attr(755,root,root) %{_bindir}/gdmXnestchooser
-
-%files init
-%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/gdm