packages: gdm/gdm-conf.patch, gdm/gdm-defaults.patch, gdm/gdm-xdmcp.patch, ...
patrys
patrys at pld-linux.org
Sat Sep 26 21:31:41 CEST 2009
Author: patrys Date: Sat Sep 26 19:31:41 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- 2.28.0
- as permitted by arekm
---- Files affected:
packages/gdm:
gdm-conf.patch (1.9 -> 1.10) , gdm-defaults.patch (1.1 -> 1.2) , gdm-xdmcp.patch (1.11 -> 1.12) , gdm-xsession.patch (1.4 -> 1.5) , gdm.init (1.17 -> 1.18) , gdm.spec (1.239 -> 1.240)
---- Diffs:
================================================================
Index: packages/gdm/gdm-conf.patch
diff -u packages/gdm/gdm-conf.patch:1.9 packages/gdm/gdm-conf.patch:1.10
--- packages/gdm/gdm-conf.patch:1.9 Sat Dec 1 17:50:03 2007
+++ packages/gdm/gdm-conf.patch Sat Sep 26 21:31:36 2009
@@ -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 @@
# 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
================================================================
Index: packages/gdm/gdm-defaults.patch
diff -u packages/gdm/gdm-defaults.patch:1.1 packages/gdm/gdm-defaults.patch:1.2
--- packages/gdm/gdm-defaults.patch:1.1 Fri Sep 21 17:41:09 2007
+++ packages/gdm/gdm-defaults.patch Sat Sep 26 21:31:36 2009
@@ -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
================================================================
Index: packages/gdm/gdm-xdmcp.patch
diff -u packages/gdm/gdm-xdmcp.patch:1.11 packages/gdm/gdm-xdmcp.patch:1.12
--- packages/gdm/gdm-xdmcp.patch:1.11 Mon Oct 13 12:01:36 2008
+++ packages/gdm/gdm-xdmcp.patch Sat Sep 26 21:31:36 2009
@@ -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));
================================================================
Index: packages/gdm/gdm-xsession.patch
diff -u packages/gdm/gdm-xsession.patch:1.4 packages/gdm/gdm-xsession.patch:1.5
--- packages/gdm/gdm-xsession.patch:1.4 Mon Oct 13 12:01:36 2008
+++ packages/gdm/gdm-xsession.patch Sat Sep 26 21:31:36 2009
@@ -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"
================================================================
Index: packages/gdm/gdm.init
diff -u packages/gdm/gdm.init:1.17 packages/gdm/gdm.init:1.18
--- packages/gdm/gdm.init:1.17 Sat Sep 26 20:14:02 2009
+++ packages/gdm/gdm.init Sat Sep 26 21:31:36 2009
@@ -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 @@
# 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
================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.239 packages/gdm/gdm.spec:1.240
--- packages/gdm/gdm.spec:1.239 Sat Sep 26 20:14:02 2009
+++ packages/gdm/gdm.spec Sat Sep 26 21:31:36 2009
@@ -1,5 +1,10 @@
# $Revision$, $Date$
#
+# 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
@@ -15,49 +20,47 @@
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
@@ -70,21 +73,24 @@
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 at Latn vs. sr at 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
@@ -120,19 +126,6 @@
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
@@ -148,21 +141,19 @@
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 at Latn#sr at 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 \
@@ -174,7 +165,9 @@
--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}
@@ -182,23 +175,17 @@
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
@@ -217,9 +204,13 @@
%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
@@ -252,49 +243,42 @@
%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)
@@ -306,6 +290,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.240 2009/09/26 19:31:36 patrys
+- 2.28.0
+- as permitted by arekm
+
Revision 1.239 2009/09/26 18:14:02 arekm
- rel 3; run by default on vt9
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm-conf.patch?r1=1.9&r2=1.10&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm-defaults.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm-xdmcp.patch?r1=1.11&r2=1.12&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm-xsession.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm.init?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm.spec?r1=1.239&r2=1.240&f=u
More information about the pld-cvs-commit
mailing list