Author: baggins Date: Wed May 19 12:50:15 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- the last functional version of GDM resurrected as gdm2.20 package
---- Files affected:
packages/gdm2.20:
gdm-conf.patch (1.10 -> 1.11) , gdm-defaults.patch (1.2 -> 1.3) ,
gdm-xdmcp.patch (1.12 -> 1.13) , gdm-xsession.patch (1.5 -> 1.6) , gdm.init
(1.18 -> 1.19) , gdm2.20.spec (1.256 -> 1.257) , gdm-custom.desktop (1.1 ->
NONE) (REMOVED), gdm-default.desktop (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/gdm2.20/gdm-conf.patch
diff -u packages/gdm2.20/gdm-conf.patch:1.10
packages/gdm2.20/gdm-conf.patch:1.11
--- packages/gdm2.20/gdm-conf.patch:1.10 Sat Sep 26 21:31:36 2009
+++ packages/gdm2.20/gdm-conf.patch Wed May 19 14:50:10 2010
@@ -1,7 +1,7 @@
-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 @@
+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.
@@ -12,21 +12,30 @@
# 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 @@
+@@ -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
+ # 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 @@
+@@ -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
- graphicalthemed...@expanded_datadir@/gdm/themes/
+ graphicalthemed...@datadir@/gdm/themes/
GraphicalThemeRand=false
================================================================
Index: packages/gdm2.20/gdm-defaults.patch
diff -u packages/gdm2.20/gdm-defaults.patch:1.2
packages/gdm2.20/gdm-defaults.patch:1.3
--- packages/gdm2.20/gdm-defaults.patch:1.2 Sat Sep 26 21:31:36 2009
+++ packages/gdm2.20/gdm-defaults.patch Wed May 19 14:50:10 2010
@@ -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
================================================================
Index: packages/gdm2.20/gdm-xdmcp.patch
diff -u packages/gdm2.20/gdm-xdmcp.patch:1.12
packages/gdm2.20/gdm-xdmcp.patch:1.13
--- packages/gdm2.20/gdm-xdmcp.patch:1.12 Sat Sep 26 21:31:36 2009
+++ packages/gdm2.20/gdm-xdmcp.patch Wed May 19 14:50:10 2010
@@ -1,11 +1,12 @@
---- 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);
+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));
================================================================
Index: packages/gdm2.20/gdm-xsession.patch
diff -u packages/gdm2.20/gdm-xsession.patch:1.5
packages/gdm2.20/gdm-xsession.patch:1.6
--- packages/gdm2.20/gdm-xsession.patch:1.5 Sat Sep 26 21:31:36 2009
+++ packages/gdm2.20/gdm-xsession.patch Wed May 19 14:50:10 2010
@@ -1,6 +1,6 @@
-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
+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"
================================================================
Index: packages/gdm2.20/gdm.init
diff -u packages/gdm2.20/gdm.init:1.18 packages/gdm2.20/gdm.init:1.19
--- packages/gdm2.20/gdm.init:1.18 Sat Sep 26 21:31:36 2009
+++ packages/gdm2.20/gdm.init Wed May 19 14:50:10 2010
@@ -14,6 +14,8 @@
. /etc/rc.d/init.d/functions
+GDM_VT=vt9
+
# Get service config
if [ -f /etc/sysconfig/gdm ]; then
. /etc/sysconfig/gdm
@@ -26,7 +28,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
+ start-stop-daemon --start -b --exec /usr/sbin/gdm ${GDM_VT}
ok
RETVAL=$?
[ $RETVAL -eq 0 ] && touch /var/lock/subsys/gdm
================================================================
Index: packages/gdm2.20/gdm2.20.spec
diff -u packages/gdm2.20/gdm2.20.spec:1.256 packages/gdm2.20/gdm2.20.spec:1.257
--- packages/gdm2.20/gdm2.20.spec:1.256 Thu May 13 00:17:30 2010
+++ packages/gdm2.20/gdm2.20.spec Wed May 19 14:50:10 2010
@@ -1,10 +1,5 @@
# $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
@@ -19,85 +14,77 @@
Summary(pt_BR.UTF-8): Gerenciador de Entrada do GNOME
Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
-Name: gdm
-Version: 2.30.2
+Name: gdm2.20
+Version: 2.20.10
Release: 1
-Epoch: 2
License: GPL/LGPL
Group: X11/Applications
-Source0:
http://ftp.gnome.org/pub/GNOME/sources/gdm/2.30/%{name}-%{version}.tar.bz2
-# Source0-md5: ba35f9f750b50be572952195989df2c5
-Source1: %{name}.pamd
-Source2: %{name}.init
-Source3: %{name}-pld-logo.png
-#Source4: %{name}-autologin.pamd
-Source5: %{name}-custom.desktop
-Source6: %{name}-default.desktop
-Patch0: %{name}-xdmcp.patch
-Patch1: %{name}-polkit.patch
-Patch2: %{name}-xsession.patch
-Patch3: %{name}-defaults.patch
+Source0:
http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/gdm-%{version}.tar.bz2
+# Source0-md5: 981c7ee7fbe453061e095ab52a3513f8
+Source1: gdm.pamd
+Source2: gdm.init
+Source3: gdm-pld-logo.png
+# http://cvs.pld-linux.org/cgi-bin/cvsweb/pld-artwork/gdm/storky/
+Source4: gdm-storky.tar.gz
+# Source4-md5: e293fbe4a60004056f6894463b874ae8
+Source5: gdm-autologin.pamd
+Patch0: gdm-xdmcp.patch
+Patch1: gdm-conf.patch
+Patch2: gdm-xsession.patch
+Patch3: gdm-desktop.patch
+Patch4: gdm-defaults.patch
URL: http://www.gnome.org/projects/gdm/
-#BuildRequires: ConsoleKit-devel >= 0.4.1
-BuildRequires: GConf2-devel >= 2.24.0
-BuildRequires: UPower-devel
+BuildRequires: ConsoleKit-devel
BuildRequires: attr-devel
-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: docbook-dtd412-xml
+BuildRequires: autoconf >= 2.52
+BuildRequires: automake
+BuildRequires: dbus-glib-devel >= 0.73
BuildRequires: gettext-devel
-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: 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: libxklavier-devel >= 4.0-2
+BuildRequires: libxml2-devel >= 1:2.6.29
BuildRequires: pam-devel
BuildRequires: perl-modules
-BuildRequires: pkgconfig
-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: 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): /usr/bin/scrollkeeper-update
+BuildRequires: xorg-lib-libdmx-devel
Requires(post,postun): gtk+2
Requires(post,postun): hicolor-icon-theme
-Requires(post,preun): GConf2
+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: /usr/bin/X
-Requires: gnome-session >= 2.30.0
-Requires: gnome-settings-daemon >= 2.24.0
+Requires: libgnomeui >= 2.20.0
Requires: pam >= 0.99.7.1
-Requires: polkit-gnome >= 0.93
Requires: which
-Requires: xorg-app-sessreg
Requires: xorg-app-xmodmap
-Suggests: zenity
+Requires: xorg-app-sessreg
Provides: XDM
Provides: group(xdm)
Provides: user(xdm)
-Obsoletes: gdm-Xnest
Conflicts: gdkxft
+Conflicts: gdm
# s...@latn vs. s...@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
@@ -133,6 +120,19 @@
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,53 +147,34 @@
%description init -l pl.UTF-8
Skrypt init dla GDM-a.
-%package user-switch-applet
-Summary: GNOME applet for fast user switching
-Summary(pl.UTF-8): Aplet GNOME do szybkiego przełączania użytkowników
-Group: X11/Applications
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Provides: gnome-applet-fast-user-switch = %{epoch}:%{version}-%{release}
-Obsoletes: gnome-applet-fast-user-switch
-
-%description user-switch-applet
-The GDM User Switch Applet is an applet for the GNOME panel which
-provides a mechanism for switching between users.
-
-%description user-switch-applet -l pl.UTF-8
-GDM User Switch Applet to aplet panelu GNOME udostępniający mechanizm
-do przełączania między użytkownikami.
-
%prep
-%setup -q
+%setup -q -a4
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-rm -f data/gdm.schemas.in
-sed -i 's/^...@shaw//' po/LINGUAS
-rm po/[email protected]
+%patch4 -p1
+
+sed -i -e 's...@latn#sr@latin#' po/LINGUAS
+mv po/s...@{latn,latin}.po
%build
%{__libtoolize}
%{__glib_gettextize}
%{__intltoolize}
%{__aclocal}
-%{__autoheader}
%{__autoconf}
%{__automake}
%configure \
--disable-console-helper \
--disable-scrollkeeper \
- --disable-silent-rules \
--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 \
- --with-user=xdm \
- --with-group=xdm
+ --with-xinerama=yes
%{__make}
@@ -201,25 +182,32 @@
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}/xsessions
+ $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 %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
+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
+%find_lang gdm --with-gnome --with-omf --all-name
-# allow executing ~/.Xclients and ~/.xsession
-install %{SOURCE5} $RPM_BUILD_ROOT%{_datadir}/xsessions/custom.desktop
-install %{SOURCE6} $RPM_BUILD_ROOT%{_datadir}/xsessions/default.desktop
+# Remove useless files
+rm $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
+
+# moved to gnome-session
+rm $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
%clean
rm -rf $RPM_BUILD_ROOT
@@ -229,13 +217,9 @@
%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
@@ -245,7 +229,7 @@
%groupremove xdm
fi
-%triggerpostun -- %{name} < 1:2.13.0.8-1
+%triggerpostun -- gdm < 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
@@ -265,58 +249,56 @@
/sbin/chkconfig --del gdm
fi
-%files -f %{name}.lang
+%files -f gdm.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
-%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-xdmcp-chooser-slave
+%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}/*
-%attr(755,root,root) %{_bindir}/*
%dir %{_sysconfdir}/gdm
-%dir %{_sysconfdir}/gdm/Init
-%attr(755,root,root) %config %{_sysconfdir}/gdm/Init/Default
+%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
-%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/*
+%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(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(1770,root,xdm) /var/lib/gdm
%attr(750,xdm,xdm) /var/log/gdm
-%attr(1777,root,xdm) /var/run/gdm
%attr(750,xdm,xdm) /home/services/xdm
%{_pixmapsdir}/*
%{_datadir}/gdm
-%{_datadir}/polkit-1/actions/gdm.policy
-%{_datadir}/xsessions/custom.desktop
+#%%{_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 init
+%files Xnest
%defattr(644,root,root,755)
-%attr(754,root,root) /etc/rc.d/init.d/gdm
+%attr(755,root,root) %{_bindir}/gdmXnest
+%attr(755,root,root) %{_bindir}/gdmXnestchooser
-%files user-switch-applet
+%files init
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/gdm-user-switch-applet
-%{_libdir}/bonobo/servers/GNOME_FastUserSwitchApplet.server
-%{_datadir}/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml
+%attr(754,root,root) /etc/rc.d/init.d/gdm
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -324,6 +306,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.257 2010/05/19 12:50:10 baggins
+- the last functional version of GDM resurrected as gdm2.20 package
+
Revision 1.256 2010/05/12 22:17:30 sparky
- BR: polkit-devel
- commented-out unused BR: ConsoleKit-devel, check, polkit-gnome-devel,
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm2.20/gdm-conf.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm2.20/gdm-defaults.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm2.20/gdm-xdmcp.patch?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm2.20/gdm-xsession.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm2.20/gdm.init?r1=1.18&r2=1.19&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm2.20/gdm2.20.spec?r1=1.256&r2=1.257&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
