- merged from DEVEL

Changed files:
    gdm-conf.patch -> 1.7
    gdm-desktop.patch -> 1.10
    gdm-xdmcp.patch -> 1.9
    gdm.spec -> 1.173
    gdm2.20.spec -> 1.173

diff --git a/gdm-conf.patch b/gdm-conf.patch
index 8b013686c8f74963f5a23805cc5f81961ef0ed3d..aca0bbd5a1d35bec70f827b298845d1ed1db59ad 100644 (file)
--- a/gdm-conf.patch
+++ b/gdm-conf.patch
@@ -1,14 +1,32 @@
-diff -urN gdm-2.8.0.2.orig/config/gdm.conf.in gdm-2.8.0.2/config/gdm.conf.in
---- gdm-2.8.0.2.orig/config/gdm.conf.in        2005-08-09 15:50:15.572151616 +0200
-+++ gdm-2.8.0.2/config/gdm.conf.in     2005-08-09 15:50:41.737173928 +0200
-@@ -71,8 +71,8 @@
- # User and group used for running gdm GUI applicaitons.  By default this
- # is set to user gdm and group gdm.  This user/group should have very
- # limited permissions and access to ony the gdm directories and files.
+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 applicaitons.  By default this is set
+ # to user "gdm" and group "gdm".  This user/group should have very limited
+ # permissions and access to ony 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.
- # doesn't always work, only if those clients have a window of their own
- #KillInitClients=true
+ # 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-desktop.patch b/gdm-desktop.patch
index 727b2944df0135b90d07d4316b33befd21c3d0c5..94966294c1cf01933175da774300c601131c852e 100644 (file)
--- a/gdm-desktop.patch
+++ b/gdm-desktop.patch
@@ -1,46 +1,48 @@
-diff -urN aa/gdm-2.6.0.3/gui/gdmphotosetup.desktop.in gdm-2.6.0.3/gui/gdmphotosetup.desktop.in
---- aa/gdm-2.6.0.3/gui/gdmphotosetup.desktop.in        2003-07-28 17:59:52.000000000 +0200
-+++ gdm-2.6.0.3/gui/gdmphotosetup.desktop.in   2004-07-26 01:38:53.871528568 +0200
-@@ -9,7 +9,7 @@
- StartupNotify=true
+diff -aurN gdm-2.13.0.7.orig/gui/gdmflexiserver.desktop.in gdm-2.13.0.7/gui/gdmflexiserver.desktop.in
+--- gdm-2.13.0.7.orig/gui/gdmflexiserver.desktop.in    2004-05-13 03:39:52.000000000 +0200
++++ gdm-2.13.0.7/gui/gdmflexiserver.desktop.in 2006-02-05 17:24:16.157522000 +0100
+@@ -7,7 +7,7 @@
+ Icon=gdm
  Terminal=false
  Type=Application
--Categories=Application;Settings;AdvancedSettings;
-+Categories=GTK;GNOME;Settings;AdvancedSettings;X-Capplet;
+-Categories=Application;System;
++Categories=GTK;GNOME;System;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gdm
  X-GNOME-Bugzilla-Component=general
-diff -urN gdm-2.6.0.3-patrys/gui/gdmsetup.desktop.in gdm-2.6.0.3/gui/gdmsetup.desktop.in
---- gdm-2.6.0.3/gui/gdmsetup.desktop.in        2004-07-26 01:38:53.871528568 +0200
-+++ gdm-2.6.0.3-patrys/gui/gdmsetup.desktop.in 2003-07-28 17:59:52.000000000 +0200
-@@ -9,7 +9,7 @@
- StartupNotify=true
+diff -aurN gdm-2.13.0.7.orig/gui/gdmflexiserver-xnest.desktop.in gdm-2.13.0.7/gui/gdmflexiserver-xnest.desktop.in
+--- gdm-2.13.0.7.orig/gui/gdmflexiserver-xnest.desktop.in      2004-05-13 03:39:52.000000000 +0200
++++ gdm-2.13.0.7/gui/gdmflexiserver-xnest.desktop.in   2006-02-05 17:22:15.987522000 +0100
+@@ -10,7 +10,7 @@
+ Icon=gdm-xnest
  Terminal=false
  Type=Application
--Categories=Application;System;SystemSetup;X-Red-Hat-Base;
-+Categories=GTK;GNOME;Settings;
+-Categories=Application;System;
++Categories=GTK;GNOME;System;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gdm
  X-GNOME-Bugzilla-Component=general
---- gdm-2.6.0.6/gui/gdmflexiserver-xnest.desktop.in2   2004-07-13 21:46:30.865876104 +0100
-+++ gdm-2.6.0.6-patrys/gui/gdmflexiserver-xnest.desktop.in     2004-12-06 20:19:28.000000000 +0200
-@@ -10,7 +10,7 @@
- Icon=gdm-xnest
+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 @@
+ StartupNotify=true
  Terminal=false
  Type=Application
--Categories=Application;System;
-+Categories=GTK;GNOME;System;
+-Categories=Application;Settings;AdvancedSettings;
++Categories=GTK;GNOME;Settings;AdvancedSettings;X-Capplet;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gdm
  X-GNOME-Bugzilla-Component=general
---- gdm-2.6.0.6/gui/gdmflexiserver.desktop.in  2004-05-13 20:19:28.000000000 +0200
-+++ gdm-2.6.0.6-patrys/gui/gdmflexiserver.desktop.in   2004-12-06 23:09:20.413390048 +0100
-@@ -7,7 +7,7 @@
- Icon=gdm
+diff -aurN gdm-2.13.0.7.orig/gui/gdmsetup.desktop.in gdm-2.13.0.7/gui/gdmsetup.desktop.in
+--- gdm-2.13.0.7.orig/gui/gdmsetup.desktop.in  2005-11-04 01:55:31.000000000 +0100
++++ gdm-2.13.0.7/gui/gdmsetup.desktop.in       2006-02-05 17:23:29.727522000 +0100
+@@ -9,7 +9,7 @@
+ StartupNotify=true
  Terminal=false
  Type=Application
--Categories=Application;System;
-+Categories=GTK;GNOME;System;
+-Categories=GNOME;Application;System;Settings;
++Categories=GTK;GNOME;Settings;
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gdm
  X-GNOME-Bugzilla-Component=general

diff --git a/gdm-xdmcp.patch b/gdm-xdmcp.patch
index fc4381c4808c308be43e0c6a1f5b349cdd55e505..06ed096a19dbab195e4397c632b149b872822d08 100644 (file)
--- a/gdm-xdmcp.patch
+++ b/gdm-xdmcp.patch
@@ -1,10 +1,10 @@
-diff -urN gdm-2.4.2.99.orig/daemon/server.c gdm-2.4.2.99/daemon/server.c
---- gdm-2.4.2.99.orig/daemon/server.c  Fri Aug  1 01:39:23 2003
-+++ gdm-2.4.2.99/daemon/server.c       Fri Aug  1 01:40:23 2003
-@@ -1061,7 +1061,7 @@
+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 (GdmLogDir, d->name, ".log");
-       VE_IGNORE_EINTR (unlink (logfile));
+       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));
  

diff --git a/gdm.spec b/gdm.spec
index fa03bc077151dbfe0dce6ea44d175c80aa1f6f1b..e0c118632e4d3b2d010423c7dd0644f55e3be821 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -14,13 +14,13 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 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
@@ -32,9 +32,8 @@ Patch0:               %{name}-xdmcp.patch
 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
@@ -54,6 +53,10 @@ BuildRequires:       libxml2-devel >= 2.5.11
 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
@@ -61,7 +64,7 @@ Requires(postun):     /usr/sbin/groupdel
 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)
@@ -74,7 +77,6 @@ Obsoletes:    xdm
 Conflicts:     gdkxft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/X11
 %define                _localstatedir  /var/lib
 
 %description
@@ -117,7 +119,7 @@ Summary:    Xnest (ie embedded X) server for GDM
 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.
@@ -147,7 +149,6 @@ Skrypt init dla GDM-a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -157,13 +158,14 @@ Skrypt init dla GDM-a.
 %{__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}
 
@@ -177,7 +179,8 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
        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
@@ -216,6 +219,11 @@ if [ "$1" = "0" ]; then
        %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
@@ -255,12 +263,12 @@ fi
 %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

diff --git a/gdm2.20.spec b/gdm2.20.spec
index fa03bc077151dbfe0dce6ea44d175c80aa1f6f1b..e0c118632e4d3b2d010423c7dd0644f55e3be821 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -14,13 +14,13 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 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
@@ -32,9 +32,8 @@ Patch0:               %{name}-xdmcp.patch
 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
@@ -54,6 +53,10 @@ BuildRequires:       libxml2-devel >= 2.5.11
 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
@@ -61,7 +64,7 @@ Requires(postun):     /usr/sbin/groupdel
 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)
@@ -74,7 +77,6 @@ Obsoletes:    xdm
 Conflicts:     gdkxft
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _sysconfdir     /etc/X11
 %define                _localstatedir  /var/lib
 
 %description
@@ -117,7 +119,7 @@ Summary:    Xnest (ie embedded X) server for GDM
 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.
@@ -147,7 +149,6 @@ Skrypt init dla GDM-a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -157,13 +158,14 @@ Skrypt init dla GDM-a.
 %{__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}
 
@@ -177,7 +179,8 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
        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
@@ -216,6 +219,11 @@ if [ "$1" = "0" ]; then
        %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
@@ -255,12 +263,12 @@ fi
 %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