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

Sprout from master 2009-11-15 20:54:52 UTC sparky <sparky@pld-linux.org> '- added "custom" an "default" desktop files to xsessions dir - they allow'
Cherrypick from master 2007-09-21 15:41:09 UTC Marcin Banasiak <marcin.banasiak@gmail.com> '- sets proper path to the X server when xorg-xserver-server is not installed (fixes #43)':
    gdm-defaults.patch -> 1.1
Cherrypick from master 2010-09-30 09:08:38 UTC Patryk Zawadzki <patrys@room-303.com> '- 2.32.0':
    gdm.spec -> 1.259
Delete:
    gdm-autologin.pamd
    gdm-conf.patch
    gdm-desktop.patch
    gdm-dont-hardcode-path.patch

diff --git a/gdm-autologin.pamd b/gdm-autologin.pamd
deleted file mode 100644 (file)
index 492e812..0000000
--- a/gdm-autologin.pamd
+++ /dev/null
@@ -1,13 +0,0 @@
-#%PAM-1.0
-auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist onerr=succeed
-auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist.gdm onerr=succeed
-auth           required        pam_tally.so deny=0 file=/var/log/faillog onerr=succeed
-auth           required        pam_permit.so
-account                required        pam_shells.so
-account                required        pam_nologin.so
-account                required        pam_access.so
-account                include         system-auth
-password       include         system-auth
-session                optional        pam_keyinit.so force revoke
-session                include         system-auth
-session                optional        pam_console.so

diff --git a/gdm-conf.patch b/gdm-conf.patch
deleted file mode 100644 (file)
index 74ca914..0000000
--- a/gdm-conf.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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.
--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.
-@@ -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
- # 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)
-@@ -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=@EXPANDED_DATADIR@/gdm/themes/
- GraphicalThemeRand=false

diff --git a/gdm-defaults.patch b/gdm-defaults.patch
index e8353845eb00ca6f1e08637559198724e64003e3..aca7a7b795d07f67a7055ebf4c4225d53535f10b 100644 (file)
--- a/gdm-defaults.patch
+++ b/gdm-defaults.patch
@@ -1,14 +1,17 @@
 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
-@@ -1206,6 +1201,10 @@
-    X_SERVER="/usr/X11R6/bin/X"
+@@ -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
-+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-desktop.patch b/gdm-desktop.patch
deleted file mode 100644 (file)
index fb29d04..0000000
--- a/gdm-desktop.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN gdm-2.13.0.7.orig/gui/gdmphotosetup.desktop.in gdm-2.13.0.7/gui/gdmphotosetup.desktop.in
---- gdm-2.13.0.7.orig/gui/gdmphotosetup.desktop.in     2003-07-26 20:57:15.000000000 +0200
-+++ gdm-2.13.0.7/gui/gdmphotosetup.desktop.in  2006-02-05 17:22:55.237522000 +0100
-@@ -9,7 +9,7 @@
- Terminal=false
- Type=Application
- NotShowIn=GNOME;
--Categories=GNOME;GTK;Settings;
-+Categories=GTK;GNOME;Settings;X-Capplet;
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=gdm
- X-GNOME-Bugzilla-Component=general

diff --git a/gdm-dont-hardcode-path.patch b/gdm-dont-hardcode-path.patch
deleted file mode 100644 (file)
index 75520e7..0000000
--- a/gdm-dont-hardcode-path.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-commit 02a48c1697a6ffe9676f20493dc426469b6f631a
-Author: Marcin Banasiak <megabajt@pld-linux.org>
-Date:   Thu Oct 1 21:40:09 2009 +0200
-
-    Don't hardcode path to polkit-gnome-authentication-agent-1
-
-diff --git a/data/greeter-autostart/Makefile.am b/data/greeter-autostart/Makefile.am
-index 0d8b01a..d12246b 100644
---- a/data/greeter-autostart/Makefile.am
-+++ b/data/greeter-autostart/Makefile.am
-@@ -30,6 +30,7 @@ EXTRA_DIST =                         \
-       gdm-simple-greeter.desktop.in.in        \
-       gnome-power-manager.desktop.in.in       \
-       gnome-settings-daemon.desktop.in.in     \
-+      polkit-gnome-authentication-agent-1.desktop.in.in \
-       $(desktop_in_files)     \
-       $(NULL)
- 
-@@ -39,6 +40,7 @@ DISTCLEANFILES =                     \
-       gdm-simple-greeter.desktop.in   \
-       gnome-power-manager.desktop.in  \
-       gnome-settings-daemon.desktop.in        \
-+      polkit-gnome-authentication-agent-1.desktop.in \
-       $(NULL)
- 
- MAINTAINERCLEANFILES =                  \
-diff --git a/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in b/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in
-deleted file mode 100644
-index b3499d1..0000000
---- a/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in
-+++ /dev/null
-@@ -1,5 +0,0 @@
--[Desktop Entry]
--Type=Application
--_Name=PolicyKit Authentication Agent
--Exec=/usr/libexec/polkit-gnome-authentication-agent-1
--OnlyShowIn=GNOME;
-diff --git a/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in b/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
-new file mode 100644
-index 0000000..e398cf6
---- /dev/null
-+++ b/data/greeter-autostart/polkit-gnome-authentication-agent-1.desktop.in.in
-@@ -0,0 +1,5 @@
-+[Desktop Entry]
-+Type=Application
-+_Name=PolicyKit Authentication Agent
-+Exec=@LIBEXECDIR@/polkit-gnome-authentication-agent-1
-+OnlyShowIn=GNOME;

diff --git a/gdm.spec b/gdm.spec
index 079b3e331b31063d8dd6fba08f2dfb8b13faa3b3..db814afa2e8ea7618f08336ab0b258287fc78983 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,9 +1,4 @@
 #
-# 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
@@ -19,13 +14,13 @@ Summary(pt_BR.UTF-8):       Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):     Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
-Version:       2.28.1
-Release:       2
+Version:       2.32.0
+Release:       1
 Epoch:         2
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/%{name}-%{version}.tar.bz2
-# Source0-md5: 917dc80f5ef6adcdc15193de238476db
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.32/%{name}-%{version}.tar.bz2
+# Source0-md5: 3c28e13a3d5e5f35d29669460acb57bb
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -35,56 +30,55 @@ Source6:    %{name}-default.desktop
 Patch0:                %{name}-xdmcp.patch
 Patch1:                %{name}-polkit.patch
 Patch2:                %{name}-xsession.patch
-Patch4:                %{name}-defaults.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=597050
-Patch5:                %{name}-dont-hardcode-path.patch
+Patch3:                %{name}-defaults.patch
 URL:           http://www.gnome.org/projects/gdm/
-BuildRequires: ConsoleKit-devel >= 0.4.1
+#BuildRequires:        ConsoleKit-devel >= 0.4.1
 BuildRequires: GConf2-devel >= 2.24.0
+BuildRequires: UPower-devel
 BuildRequires: attr-devel
 BuildRequires: audit-libs-devel
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake >= 1:1.9
-BuildRequires: check >= 0.9.4
+#BuildRequires:        check >= 0.9.4
 BuildRequires: dbus-glib-devel >= 0.74
 BuildRequires: docbook-dtd412-xml
 BuildRequires: gettext-devel
-BuildRequires: glib2-devel >= 1:2.16.0
+BuildRequires: glib2-devel >= 1:2.22.0
 BuildRequires: gnome-doc-utils
 BuildRequires: gnome-panel-devel >= 2.24.0
 BuildRequires: gtk+2-devel >= 2:2.14.0
 BuildRequires: intltool >= 0.40.0
 BuildRequires: iso-codes
 BuildRequires: libcanberra-gtk-devel >= 0.4
-BuildRequires: libglade2-devel >= 1:2.6.2
 %{?with_selinux:BuildRequires: libselinux-devel}
 BuildRequires: libtool
 BuildRequires: libxklavier-devel >= 4.0-2
 BuildRequires: pam-devel
 BuildRequires: perl-modules
 BuildRequires: pkgconfig
-BuildRequires: polkit-gnome-devel >= 0.92
+BuildRequires: polkit-devel
+#BuildRequires:        polkit-gnome-devel >= 0.92
 BuildRequires: rpmbuild(find_lang) >= 1.23
 BuildRequires: rpmbuild(macros) >= 1.311
-BuildRequires: scrollkeeper
+#BuildRequires:        scrollkeeper
 BuildRequires: xorg-lib-libXdmcp-devel
 BuildRequires: xorg-lib-libXi-devel
 BuildRequires: xorg-lib-libXinerama-devel
-BuildRequires: xorg-lib-libdmx-devel
-Requires(post,preun):  GConf2
+#BuildRequires:        xorg-lib-libdmx-devel
 Requires(post,postun): /usr/bin/scrollkeeper-update
 Requires(post,postun): gtk+2
 Requires(post,postun): hicolor-icon-theme
+Requires(post,preun):  GConf2
 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:      /usr/bin/Xorg
-Requires:      gnome-session >= 2.24.0
+Requires:      /usr/bin/X
+Requires:      gnome-session >= 2.30.0
 Requires:      gnome-settings-daemon >= 2.24.0
 Requires:      pam >= 0.99.7.1
-Requires:      polkit-gnome >= 0.92
+Requires:      polkit-gnome >= 0.93
 Requires:      which
 Requires:      xorg-app-sessreg
 Requires:      xorg-app-xmodmap
@@ -151,7 +145,7 @@ Skrypt init dla GDM-a.
 Summary:       GNOME applet for fast user switching
 Summary(pl.UTF-8):     Aplet GNOME do szybkiego przełączania użytkowników
 Group:         X11/Applications
-Requires:      gdm >= 2:2.22.0
+Requires:      %{name} = %{epoch}:%{version}-%{release}
 Provides:      gnome-applet-fast-user-switch = %{epoch}:%{version}-%{release}
 Obsoletes:     gnome-applet-fast-user-switch
 
@@ -168,9 +162,9 @@ do przełączania między użytkownikami.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch4 -p1
-%patch5 -p1
-rm -f data/gdm.schemas.in
+%patch3 -p1
+sed -i 's/^en@shaw//' po/LINGUAS
+rm po/en@shaw.po
 
 %build
 %{__libtoolize}
@@ -183,6 +177,7 @@ rm -f data/gdm.schemas.in
 %configure \
        --disable-console-helper \
        --disable-scrollkeeper \
+       --disable-silent-rules \
        --with-console-kit \
        --enable-authentication-scheme=pam \
        --with-pam-prefix=/etc \
@@ -286,19 +281,17 @@ fi
 %dir %{_sysconfdir}/gdm/PostLogin
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
 %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) /etc/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) %{_localstatedir}/gdm
-%attr(1755,root,xdm) %{_localstatedir}/cache/gdm
-%attr(1770,root,xdm) %dir %{_localstatedir}/lib/gdm
-%attr(1750,root,xdm) %dir %{_localstatedir}/lib/gdm/.gconf.mandatory
-%attr(1640,root,xdm) %{_localstatedir}/lib/gdm/.gconf.mandatory/*.xml
-%attr(644,root,xdm) %{_localstatedir}/lib/gdm/.gconf.path
-%attr(750,xdm,xdm) %{_localstatedir}/log/gdm
-%attr(1777,root,xdm) %{_localstatedir}/run/gdm
+%attr(1755,root,xdm) /var/cache/gdm
+%attr(1770,root,xdm) %dir /var/lib/gdm
+%attr(1750,root,xdm) %dir /var/lib/gdm/.gconf.mandatory
+%attr(1640,root,xdm) /var/lib/gdm/.gconf.mandatory/*.xml
+%attr(644,root,xdm) /var/lib/gdm/.gconf.path
+%attr(750,xdm,xdm) /var/log/gdm
+%attr(1777,root,xdm) /var/run/gdm
 %attr(750,xdm,xdm) /home/services/xdm
 %{_pixmapsdir}/*
 %{_datadir}/gdm