- merge from DEVEL

[packages/gdm.git] / gdm.spec

diff --git a/gdm.spec b/gdm.spec
index 155c17980d07989aa03f4acebf0af438f97a9b1c..1e8a4b899f5e6dc07dfd45459da0b2940f908b50 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -2,7 +2,6 @@
 # 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
@@ -15,13 +14,13 @@ Summary(pt_BR.UTF-8):       Gerenciador de Entrada do GNOME
 Summary(ru.UTF-8):     Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
-Version:       2.20.0
-Release:       2
+Version:       2.20.7
+Release:       1
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.20/%{name}-%{version}.tar.bz2
-# Source0-md5: cf374113a1f837b0df916572625b5078
+# Source0-md5: 15be72743003cb1e36c9ce2ac2de5381
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -34,18 +33,18 @@ Patch1:             %{name}-conf.patch
 Patch2:                %{name}-xsession.patch
 Patch3:                %{name}-desktop.patch
 Patch4:                %{name}-defaults.patch
-URL:           http://www.jirka.org/gdm.html
+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.14
+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.19.1
+BuildRequires: libgnomeui-devel >= 2.20.0
 BuildRequires: libgsf-devel >= 1.14.6
 BuildRequires: librsvg-devel >= 1:2.18.1
 %{?with_selinux:BuildRequires: libselinux-devel}
@@ -53,8 +52,10 @@ BuildRequires:       libtool
 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
@@ -67,14 +68,17 @@ Requires(postun):   /usr/sbin/userdel
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
-Requires:      libgnomeui >= 2.19.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)
 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
@@ -149,6 +153,9 @@ Skrypt init dla GDM-a.
 %patch3 -p1
 %patch4 -p1
 
+sed -i -e 's#sr@Latn#sr@latin#' po/LINGUAS
+mv po/sr@{Latn,latin}.po
+
 %build
 %{__libtoolize}
 %{__glib_gettextize}
@@ -159,6 +166,7 @@ Skrypt init dla GDM-a.
 %configure \
        --disable-console-helper \
        --disable-scrollkeeper \
+       --with-console-kit \
        --enable-authentication-scheme=pam \
        --with-pam-prefix=/etc \
        --with-tcp-wrappers=yes \
@@ -191,7 +199,7 @@ install storky/*.* $RPM_BUILD_ROOT%{_datadir}/gdm/themes/storky/
 
 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}
@@ -277,7 +285,7 @@ fi
 #%%{_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*