# TODO:
+# /etc/X11/dm dir should belong to XFree? It is common for KDE and GNOME
# s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2
# check /etc/pam.d/gdm-autologin
#
-
Summary: GNOME Display Manager
Summary(es): Administrador de Entrada del GNOME
Summary(ja): GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã
Summary(ru): äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
Summary(uk): äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
Name: gdm
-Version: 2.4.1.4
+Version: 2.6.0.6
Release: 1
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.4/%{name}-%{version}.tar.bz2
-# Source0-md5: f1c0272f879abb8d8d412b1d45be5b6c
+Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
+# Source0-md5: 8dca7cb1f28d81f60f6e07b3c24288c5
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
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
+URL: http://www.jirka.org/gdm.html
+BuildRequires: attr-devel
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2.0.6
-BuildRequires: intltool >= 0.22
-BuildRequires: libglade2-devel >= 2.0.1
-BuildRequires: libgnomecanvas-devel >= 2.0.3
-BuildRequires: libgnome-devel >= 2.0.6
-BuildRequires: libgnomeui-devel >= 2.0.4
-BuildRequires: librsvg-devel >= 2.0.1
+BuildRequires: gtk+2-devel >= 2:2.4.3
+BuildRequires: intltool >= 0.30
+BuildRequires: libglade2-devel >= 1:2.4.0
+BuildRequires: libgnome-devel >= 2.6.1
+BuildRequires: libgnomecanvas-devel >= 2.6.1
+BuildRequires: libgnomeui-devel >= 2.6.1
+BuildRequires: libgsf-devel >= 1.9.0
+BuildRequires: librsvg-devel >= 1:2.6.5
+BuildRequires: libselinux-devel
BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.4.24
+BuildRequires: libxml2-devel >= 2.5.11
BuildRequires: pam-devel
BuildRequires: perl-modules
-BuildRequires: scrollkeeper >= 0.3.11
-Requires: libgnome >= 2.1.0-3
-Requires: which
+BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: scrollkeeper
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+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(pre): /bin/id
-Requires(pre): /usr/sbin/groupadd
-Requires(pre): /usr/sbin/useradd
-Requires(postun): /usr/sbin/userdel
-Requires(postun): /usr/sbin/groupdel
-Requires(post,postun):scrollkeeper
-Requires(post,preun):/sbin/chkconfig
+Requires: which
+Requires: pam >= 0.77.3-7
+Provides: group(xdm)
+Provides: user(xdm)
+Obsoletes: X11-xdm
+Obsoletes: kdm
+Obsoletes: wdm
+Obsoletes: xdm
Conflicts: gdkxft
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-Obsoletes: xdm kdm wdm
+%define _sysconfdir /etc/X11
%define _localstatedir /var/lib
%description
Summary: Xnest (ie embedded X) server for GDM
Summary(pl): Serwer Xnest dla GDM
Group: X11/Applications
-Requires: %{name} = %{version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: XFree86-Xnest
%description Xnest
Summary: Init script for GDM
Summary(pl): Skrypt init dla GDM-a
Group: X11/Applications
-Requires: %{name} = %{version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: open
+Requires(post,preun): /sbin/chkconfig
%description init
Init script for GDM.
Skrypt init dla GDM-a.
%prep
-%setup -q
+%setup -q -a4
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
%build
rm -f missing
%{__libtoolize}
glib-gettextize --copy --force
+intltoolize --copy --force
%{__aclocal}
%{__autoconf}
%{__automake}
--with-pam-prefix=/etc \
--with-tcp-wrappers=yes \
--enable-authentication-scheme=pam \
- --disable-console-helper
+ --disable-console-helper \
+ --with-selinux
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \
- $RPM_BUILD_ROOT/home/services/xdm
+ $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 %{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
+rm -r $RPM_BUILD_ROOT%{_datadir}/locale/no
+
%find_lang %{name} --all-name --with-gnome
+# Remove useless files
+rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
+
+# moved to gnome-session
+rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
+
%clean
rm -rf $RPM_BUILD_ROOT
%pre
-/usr/sbin/groupadd -g 55 -r -f xdm
-
-if [ -z "`id -u xdm 2>/dev/null`" ]; then
- /usr/sbin/useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
+if [ -n "`getgid xdm`" ]; then
+ if [ "`getgid xdm`" != "55" ]; then
+ echo "Error: group xdm doesn't have gid=55. Correct this before installing %{name}." 1>&2
+ exit 1
+ fi
+else
+ /usr/sbin/groupadd -g 55 -r -f xdm
+fi
+if [ -n "`/bin/id -u xdm 2>/dev/null`" ]; then
+ if [ "`/bin/id -u xdm`" != "55" ]; then
+ echo "Error: user xdm doesn't have UID=55. Correct this before installing xdm." 1>&2
+ exit 1
+ fi
+else
+ /usr/sbin/useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
fi
%post
%postun
/usr/bin/scrollkeeper-update
if [ "$1" = "0" ]; then
- if [ -n "`id -u xdm 2>/dev/null`" ]; then
- /usr/sbin/userdel xdm
- fi
- /usr/sbin/groupdel xdm
+ %userremove xdm
+ %groupremove xdm
fi
%post init
%attr(755,root,root) %{_bindir}/gdmflexiserver
%attr(755,root,root) %{_bindir}/gdmgreeter
%attr(755,root,root) %{_bindir}/gdmlogin
-%attr(755,root,root) %{_bindir}/gdmmktemp
%attr(755,root,root) %{_bindir}/gdmphotosetup
%attr(755,root,root) %{_bindir}/gdmsetup
%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) %{_sbindir}/*
%dir %{_sysconfdir}/gdm
+%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/Sessions
%attr(755,root,root) %config %{_sysconfdir}/gdm/PostSession
-%attr(755,root,root) %config %{_sysconfdir}/gdm/gnomerc
%attr(755,root,root) %config %{_sysconfdir}/gdm/XKeepsCrashing
+%attr(755,root,root) %config %{_sysconfdir}/gdm/Xsession
%config %{_sysconfdir}/gdm/factory-gdm.conf
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/gdm/gdm.conf
+%config %{_sysconfdir}/gdm/PostLogin/Default.sample
+%config %{_sysconfdir}/gdm/modules/*
+
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/gdm/gdm.conf
%config %{_sysconfdir}/gdm/locale.alias
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/gdm*
%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.gdm
%attr(750,xdm,xdm) /var/lib/gdm
+%attr(750,xdm,xdm) /var/log/gdm
%attr(750,xdm,xdm) /home/services/xdm
%{_pixmapsdir}/*
-%{_datadir}/applications/gdmsetup.desktop
-%{_datadir}/applications/gdmflexiserver.desktop
+%{_desktopdir}/gdmsetup.desktop
+%{_desktopdir}/gdmflexiserver.desktop
%{_datadir}/gnome/capplets/*
%{_datadir}/gdm
+#%%{_datadir}/xsessions - moved to gnome-session
+%{_datadir}/xsessions/default.desktop
+%{_iconsdir}/hicolor/*/apps/*.png
+%{_omf_dest_dir}/gdm
+%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}/gdmXnestchooser
-%{_datadir}/applications/gdmflexiserver-xnest.desktop
+%{_desktopdir}/gdmflexiserver-xnest.desktop
%files init
%defattr(644,root,root,755)