# TODO:
# - s=/dev/null=/home/services/xdm= in %%trigger for graceful upgrade from xdm/kdm/gdm 2.2
# - check /etc/pam.d/gdm-autologin
-# - ConsoleKit support
#
# Conditiional build:
%bcond_without selinux # without selinux
Summary(ru.UTF-8): Дисплейный менеджер GNOME
Summary(uk.UTF-8): Дисплейний менеджер GNOME
Name: gdm
-Version: 2.18.1
-Release: 2
+Version: 2.20.4
+Release: 1
Epoch: 1
License: GPL/LGPL
Group: X11/Applications
-Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5: a80e26d98adbe485aac0f9aee64b92b1
+Source0: http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/%{name}-%{version}.tar.bz2
+# Source0-md5: 53a75133cadf1de5fea2be49483b9ce3
Source1: %{name}.pamd
Source2: %{name}.init
Source3: %{name}-pld-logo.png
Patch0: %{name}-xdmcp.patch
Patch1: %{name}-conf.patch
Patch2: %{name}-xsession.patch
-Patch3: %{name}-logdir.patch
-Patch4: %{name}-desktop.patch
-Patch5: %{name}-xorg.patch
-Patch6: %{name}-sessreg.patch
-URL: http://www.jirka.org/gdm.html
+Patch3: %{name}-desktop.patch
+Patch4: %{name}-defaults.patch
+URL: http://www.gnome.org/projects/gdm/
+BuildRequires: ConsoleKit-devel
BuildRequires: attr-devel
BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: dbus-glib-devel >= 0.73
BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 2:2.10.10
-BuildRequires: intltool >= 0.35.5
+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.0
-BuildRequires: libgnomeui-devel >= 2.18.1
-BuildRequires: libgsf-devel >= 1.14.2
-BuildRequires: librsvg-devel >= 1:2.16.1
+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.27
+BuildRequires: libxml2-devel >= 1:2.6.29
BuildRequires: pam-devel
BuildRequires: perl-modules
-BuildRequires: rpmbuild(macros) >= 1.268
+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
Requires(pre): /bin/id
Requires(pre): /usr/sbin/groupadd
Requires(pre): /usr/sbin/useradd
-Requires: libgnomeui >= 2.18.1
+Requires: libgnomeui >= 2.20.0
Requires: pam >= 0.99.7.1
Requires: which
+Requires: xorg-app-xmodmap
Requires: xorg-app-sessreg
+Provides: XDM
Provides: group(xdm)
Provides: user(xdm)
-Obsoletes: X11-xdm
-Obsoletes: entrance
-Obsoletes: kdm
-Obsoletes: slim
-Obsoletes: wdm
-Obsoletes: xdm
Conflicts: gdkxft
+# sr@Latn vs. sr@latin
+Conflicts: glibc-misc < 6:2.7
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _localstatedir /var/lib
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
%build
%{__libtoolize}
%configure \
--disable-console-helper \
--disable-scrollkeeper \
+ --with-console-kit \
--enable-authentication-scheme=pam \
--with-pam-prefix=/etc \
--with-tcp-wrappers=yes \
touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
-%find_lang %{name} --all-name --with-gnome
+%find_lang %{name} --with-gnome --with-omf --all-name
# Remove useless files
rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/modules/*.{la,a}
%attr(750,xdm,xdm) /var/log/gdm
%attr(750,xdm,xdm) /home/services/xdm
%{_pixmapsdir}/*
-%{_desktopdir}/gdmsetup.desktop
-%{_desktopdir}/gdmflexiserver.desktop
-%{_desktopdir}/gdmphotosetup.desktop
%{_datadir}/gdm
#%%{_datadir}/xsessions - moved to gnome-session
%{_datadir}/xsessions/default.desktop
%{_iconsdir}/hicolor/*/apps/*.png
-%{_omf_dest_dir}/gdm
+%{_iconsdir}/hicolor/*/apps/*.svg
%attr(755,root,root) %{_libdir}/gtk-2.0/modules/lib*.so
%{_mandir}/man1/gdm*
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gdmXnest
%attr(755,root,root) %{_bindir}/gdmXnestchooser
-%{_desktopdir}/gdmflexiserver-xnest.desktop
%files init
%defattr(644,root,root,755)