- 2.28.0

- as permitted by arekm

Changed files:
    gdm-conf.patch -> 1.10
    gdm-defaults.patch -> 1.2
    gdm-xdmcp.patch -> 1.12
    gdm-xsession.patch -> 1.5
    gdm.init -> 1.18
    gdm.spec -> 1.240

diff --git a/gdm-conf.patch b/gdm-conf.patch
index c35ab4449f06acace4d65f801c88fbd3ea7c8d24..74ca914e98f477377a5df0b97272e65fa3d08ced 100644 (file)
--- a/gdm-conf.patch
+++ b/gdm-conf.patch
@@ -1,7 +1,7 @@
-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 @@
+diff -aurN gdm-2.13.0.7.orig/config/gdm.conf.in gdm-2.13.0.7/config/gdm.conf.in
+--- gdm-2.13.0.7.orig/config/gdm.conf.in       2006-01-28 00:11:50.000000000 +0100
++++ gdm-2.13.0.7/config/gdm.conf.in    2006-02-05 17:27:41.737522000 +0100
+@@ -92,8 +92,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.
@@ -12,30 +12,21 @@ diff -urN gdm-2.20.2/config/gdm.conf.in gdm-2.20.2.new/config/gdm.conf.in
  
  # 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 @@
+@@ -159,7 +159,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
+ # 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 @@
+@@ -436,7 +436,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/
+ GraphicalThemeDir=@EXPANDED_DATADIR@/gdm/themes/
  GraphicalThemeRand=false

diff --git a/gdm-defaults.patch b/gdm-defaults.patch
index aca7a7b795d07f67a7055ebf4c4225d53535f10b..e8353845eb00ca6f1e08637559198724e64003e3 100644 (file)
--- a/gdm-defaults.patch
+++ b/gdm-defaults.patch
@@ -1,17 +1,14 @@
 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"
+@@ -1206,6 +1201,10 @@
+    X_SERVER="/usr/X11R6/bin/X"
     X_CONFIG_OPTIONS="-audit 0"
  fi
++X_PATH="/usr/bin"
++X_SERVER_PATH="/usr/bin"
++X_SERVER="/usr/bin/Xorg vt9"
++X_CONFIG_OPTIONS="-audit 0"
  
+ dnl ---------------------------------------------------------------------------
+ dnl - Check for Xnest / Xephyr support

diff --git a/gdm-xdmcp.patch b/gdm-xdmcp.patch
index 06ed096a19dbab195e4397c632b149b872822d08..9b3e7b8f80b5412edd723aaaaeeb28694105b230 100644 (file)
--- a/gdm-xdmcp.patch
+++ b/gdm-xdmcp.patch
@@ -1,12 +1,11 @@
-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));
+--- gdm-2.24.0.orig/daemon/gdm-server.c        2008-10-03 00:53:12.000000000 +0200
++++ gdm-2.24.0/daemon/gdm-server.c     2008-10-03 00:53:57.000000000 +0200
+@@ -419,7 +419,7 @@
+         g_debug ("GdmServer: Opening logfile for server %s", log_path);
+ 
+         VE_IGNORE_EINTR (g_unlink (log_path));
+-        VE_IGNORE_EINTR (logfd = open (log_path, O_CREAT|O_APPEND|O_TRUNC|O_WRONLY|O_EXCL, 0644));
++        VE_IGNORE_EINTR (logfd = open (log_path, O_CREAT|O_APPEND|O_TRUNC|O_WRONLY|O_EXCL, 0640));
+ 
+         g_free (log_path);
  
-       if (logfd != -1) {
-               VE_IGNORE_EINTR (dup2 (logfd, 1));

diff --git a/gdm-xsession.patch b/gdm-xsession.patch
index a5447caf8cdcf2ef4fa1793ac18d9508b6850ef3..b60d73a7f11f564d9959602455122d00e5e3291d 100644 (file)
--- a/gdm-xsession.patch
+++ b/gdm-xsession.patch
@@ -1,6 +1,6 @@
-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
+diff -urN gdm-2.6.0.3.orig/data/Xsession.in gdm-2.6.0.3/data/Xsession.in
+--- gdm-2.6.0.3.orig/data/Xsession.in  2004-05-28 21:50:17.000000000 +0200
++++ gdm-2.6.0.3/data/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"

diff --git a/gdm.init b/gdm.init
index 8224b8581c7ce5989ed700beceffdb1f4b5a7180..3a620f50feec8ccc8c20eabfea20a7635e677a5b 100644 (file)
--- a/gdm.init
+++ b/gdm.init
@@ -14,8 +14,6 @@
 
 . /etc/rc.d/init.d/functions
 
-GDM_VT=vt9
-
 # Get service config
 if [ -f /etc/sysconfig/gdm ]; then
        . /etc/sysconfig/gdm
@@ -28,7 +26,7 @@ case "$1" in
        # Check if the service is already running?
        if [ ! -f /var/lock/subsys/gdm ]; then
                msg_starting "Gnome Display Manager"
-               start-stop-daemon --start -b --exec /usr/sbin/gdm ${GDM_VT}
+               start-stop-daemon --start -b --exec /usr/sbin/gdm
                ok
                RETVAL=$?
                [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gdm

diff --git a/gdm.spec b/gdm.spec
index 909234505c2b5cea25765a24322a0e682b731860..2caf0da3ef48b7f0f8138cdbb38a93799cc534a9 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,4 +1,9 @@
 #
+# BIG FAT WARNING!
+#
+#      Merged to HEAD with RM's permission. If you need GDM 2.20,
+#      create a separate spec for your personal use (like gdm-220.spec)
+#
 # TODO:
 # - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
 # - check /etc/pam.d/gdm-autologin
@@ -14,49 +19,47 @@ 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.10
-Release:       3
+Version:       2.28.0
+Release:       1
 Epoch:         2
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: 981c7ee7fbe453061e095ab52a3513f8
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/%{name}-%{version}.tar.bz2
+# Source0-md5: 7724929a6b75ba269fd519d4a4995bbb
 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
+#Source4:      %{name}-autologin.pamd
 Patch0:                %{name}-xdmcp.patch
-Patch1:                %{name}-conf.patch
+Patch1:                %{name}-polkit.patch
 Patch2:                %{name}-xsession.patch
-Patch3:                %{name}-desktop.patch
 Patch4:                %{name}-defaults.patch
 URL:           http://www.gnome.org/projects/gdm/
 BuildRequires: ConsoleKit-devel
+BuildRequires: GConf2-devel >= 2.24.0
 BuildRequires: attr-devel
-BuildRequires: autoconf >= 2.52
-BuildRequires: automake
-BuildRequires: dbus-glib-devel >= 0.73
+BuildRequires: audit-libs-devel
+BuildRequires: autoconf >= 2.60
+BuildRequires: automake >= 1:1.9
+BuildRequires: check >= 0.9.4
+BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: gettext-devel
+BuildRequires: glib2-devel >= 1:2.16.0
 BuildRequires: gnome-doc-utils
-BuildRequires: gtk+2-devel >= 2:2.12.0
-BuildRequires: intltool >= 0.36.1
-BuildRequires: libart_lgpl-devel >= 2.3.19
+BuildRequires: gnome-panel-devel >= 2.24.0
+BuildRequires: gtk+2-devel >= 2:2.14.0
+BuildRequires: intltool >= 0.40.0
 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: libxklavier-devel >= 4.0-2
 BuildRequires: pam-devel
 BuildRequires: perl-modules
+BuildRequires: pkgconfig
+BuildRequires: polkit-gnome-devel >= 0.92
 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
@@ -69,21 +72,24 @@ 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:      /usr/bin/Xorg
+Requires:      gnome-session >= 2.24.0
+Requires:      gnome-settings-daemon >= 2.24.0
+Requires:      libgnomeui >= 2.24.0
 Requires:      pam >= 0.99.7.1
+Requires:      polkit-gnome >= 0.92
 Requires:      which
-Requires:      xorg-app-xmodmap
 Requires:      xorg-app-sessreg
+Requires:      xorg-app-xmodmap
 Provides:      XDM
 Provides:      group(xdm)
 Provides:      user(xdm)
+Obsoletes:     gdm-Xnest
 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
@@ -119,19 +125,6 @@ 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
@@ -147,21 +140,19 @@ Init script for GDM.
 Skrypt init dla GDM-a.
 
 %prep
-%setup -q -a4
+%setup -q
 %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
+rm -f data/gdm.schemas.in
 
 %build
 %{__libtoolize}
 %{__glib_gettextize}
 %{__intltoolize}
 %{__aclocal}
+%{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
@@ -173,7 +164,9 @@ mv po/sr@{Latn,latin}.po
        --with-tcp-wrappers=yes \
        --with%{!?with_selinux:out}-selinux \
        --with-xdmcp=yes \
-       --with-xinerama=yes
+       --with-xinerama=yes \
+       --with-user=xdm \
+       --with-group=xdm
 
 %{__make}
 
@@ -181,23 +174,17 @@ mv po/sr@{Latn,latin}.po
 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 %{SOURCE4} $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
@@ -216,9 +203,13 @@ rm -rf $RPM_BUILD_ROOT
 %useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
 
 %post
+%gconf_schema_install gdm-simple-greeter.schemas
 %scrollkeeper_update_post
 %update_icon_cache hicolor
 
+%preun
+%gconf_schema_uninstall gdm-simple-greeter.schemas
+
 %postun
 %scrollkeeper_update_postun
 %update_icon_cache hicolor
@@ -251,49 +242,42 @@ 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) %{_libexecdir}/gdm-crash-logger
+%attr(755,root,root) %{_libexecdir}/gdm-factory-slave
+%attr(755,root,root) %{_libexecdir}/gdm-host-chooser
+%attr(755,root,root) %{_libexecdir}/gdm-product-slave
+%attr(755,root,root) %{_libexecdir}/gdm-session-worker
+%attr(755,root,root) %{_libexecdir}/gdm-simple-chooser
+%attr(755,root,root) %{_libexecdir}/gdm-simple-greeter
+%attr(755,root,root) %{_libexecdir}/gdm-simple-slave
+%attr(755,root,root) %{_libexecdir}/gdm-user-switch-applet
+%attr(755,root,root) %{_libexecdir}/gdm-xdmcp-chooser-slave
 %attr(755,root,root) %{_sbindir}/*
+%attr(755,root,root) %{_bindir}/*
 %dir %{_sysconfdir}/gdm
-%dir %{_sysconfdir}/gdm/modules
-%attr(755,root,root) %config %{_sysconfdir}/gdm/Init
+%dir %{_sysconfdir}/gdm/Init
+%attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
 %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
+%dir %{_sysconfdir}/gdm/PostLogin
 %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) %{_sysconfdir}/gdm/custom.conf
+%{_sysconfdir}/gdm/gdm.schemas
+%{_sysconfdir}/gconf/schemas/gdm-simple-greeter.schemas
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/dbus-1/system.d/*
 %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(1770,root,xdm) /var/lib/gdm
-%attr(750,xdm,xdm) /var/log/gdm
+%attr(750,xdm,xdm) %{_localstatedir}/gdm
+%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
 %attr(750,xdm,xdm) /home/services/xdm
 %{_pixmapsdir}/*
 %{_datadir}/gdm
-#%%{_datadir}/xsessions  -  moved to gnome-session
-%{_datadir}/xsessions/default.desktop
+%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
+%{_datadir}/polkit-1/actions/gdm.policy
 %{_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
+%{_libdir}/bonobo/servers/*.server
+%{_localstatedir}/lib/gdm
 
 %files init
 %defattr(644,root,root,755)