+#
# 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
+# s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
# check /etc/pam.d/gdm-autologin
#
# Conditiional build:
Summary(ru): äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
Summary(uk): äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
Name: gdm
-Version: 2.6.0.9
+Version: 2.16.0
Release: 1
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: d845fe205412bb101d4c66d1e88a317d
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.16/%{name}-%{version}.tar.bz2
+# Source0-md5: 641116667d3486eca842dd1a2fc792c7
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}-pld-logo.png
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
BuildRequires: automake
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.4.3
-BuildRequires: intltool >= 0.30
-BuildRequires: libglade2-devel >= 1:2.4.1
-BuildRequires: libgnome-devel >= 2.6.1
-BuildRequires: libgnomecanvas-devel >= 2.6.1
-BuildRequires: libgnomeui-devel >= 2.10.0-2
-BuildRequires: libgsf-devel >= 1.9.0
-BuildRequires: librsvg-devel >= 1:2.6.5
+BuildRequires: gtk+2-devel >= 2:2.10.3
+BuildRequires: intltool >= 0.35
+BuildRequires: libglade2-devel >= 1:2.6.0
+BuildRequires: libgnomeui-devel >= 2.16.0
+BuildRequires: libgsf-devel >= 1.14.1
+BuildRequires: librsvg-devel >= 1:2.16.0
%{?with_selinux:BuildRequires: libselinux-devel}
BuildRequires: libtool
-BuildRequires: libxml2-devel >= 2.5.11
+BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: pam-devel
BuildRequires: perl-modules
-BuildRequires: rpmbuild(macros) >= 1.197
+BuildRequires: rpmbuild(macros) >= 1.268
+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
+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(postun): /usr/sbin/groupdel
-Requires(postun): /usr/sbin/userdel
-Requires(post,postun): /usr/bin/scrollkeeper-update
-Requires: libgnome >= 2.6.1
-Requires: sessreg
+Requires: libgnomeui >= 2.16.0
+Requires: pam >= 0.79.0
Requires: which
-Requires: pam >= 0.77.3-7
+Requires: xorg-app-sessreg
Provides: group(xdm)
Provides: user(xdm)
Obsoletes: X11-xdm
Conflicts: gdkxft
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define _sysconfdir /etc/X11
%define _localstatedir /var/lib
%description
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.
Summary: Init script for GDM
Summary(pl): Skrypt init dla GDM-a
Group: X11/Applications
+Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: open
-Requires(post,preun): /sbin/chkconfig
%description init
Init script for GDM.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
%build
%{__libtoolize}
%{__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}
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
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 -rf $RPM_BUILD_ROOT
%pre
-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
+%groupadd -g 55 -r -f xdm
+%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
%post
%scrollkeeper_update_post
%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
- echo "Run \"/etc/rc.d/init.d/gdm restart\" to restart gdm." >&2
+ echo "Run \"/sbin/service gdm restart\" to restart gdm." >&2
+ echo "WARNING: it will terminate all sessions opened from gdm!" >&2
else
- echo "Run \"/etc/rc.d/init.d/gdm start\" to start gdm." >&2
+ echo "Run \"/sbin/service gdm start\" to start gdm." >&2
fi
%preun init
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/gdm ]; then
- /etc/rc.d/init.d/gdm stop >&2
- fi
+ %service gdm stop
/sbin/chkconfig --del gdm
fi
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/gdm
-%attr(755,root,root) %{_bindir}/gdm-binary
-%attr(755,root,root) %{_bindir}/gdmchooser
+%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}/gdmgreeter
-%attr(755,root,root) %{_bindir}/gdmlogin
%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) %{_libdir}/gdmchooser
+%attr(755,root,root) %{_libdir}/gdmgreeter
+%attr(755,root,root) %{_libdir}/gdmlogin
%attr(755,root,root) %{_sbindir}/*
%dir %{_sysconfdir}/gdm
%dir %{_sysconfdir}/gdm/modules
%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 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
+%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
%attr(750,xdm,xdm) /var/log/gdm
%attr(750,xdm,xdm) /home/services/xdm
%{_pixmapsdir}/*
%{_desktopdir}/gdmsetup.desktop
%{_desktopdir}/gdmflexiserver.desktop
-%{_datadir}/gnome/capplets/*
+%{_desktopdir}/gdmphotosetup.desktop
%{_datadir}/gdm
#%%{_datadir}/xsessions - moved to gnome-session
%{_datadir}/xsessions/default.desktop
%files Xnest
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gdmXnest
%attr(755,root,root) %{_bindir}/gdmXnestchooser
%{_desktopdir}/gdmflexiserver-xnest.desktop
projects / packages / gdm2.20.git / blobdiff