- switch from pam_make to pam_exec

[packages/gdm2.20.git] / gdm.spec

diff --git a/gdm.spec b/gdm.spec
index 063afe06ec71b091bae9b5f42ad7feea0731cebd..fca779e65eb9dae6512a3061518da28b1d58204e 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,6 +1,6 @@
+#
 # 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:
@@ -14,13 +14,13 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.14.2
-Release:       1
+Version:       2.16.5
+Release:       2
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.14/%{name}-%{version}.tar.bz2
-# Source0-md5: 069adb0a5daea6d088d7445d30de2057
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gdm/2.16/%{name}-%{version}.tar.bz2
+# Source0-md5: 8f223458b0e957650f6d865a06a271e4
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -34,44 +34,46 @@ 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
 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.9
+BuildRequires: intltool >= 0.35.0
+BuildRequires: libglade2-devel >= 1:2.6.0
+BuildRequires: libgnomeui-devel >= 2.16.1
+BuildRequires: libgsf-devel >= 1.14.2
+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.27
 BuildRequires: pam-devel
 BuildRequires: perl-modules
-BuildRequires: rpmbuild(macros) >= 1.231
-BuildRequires: xorg-lib-libdmx-devel
+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): gtk+2
+Requires(post,postun): hicolor-icon-theme
+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:      xorg-app-sessreg
+Requires:      libgnomeui >= 2.16.1
+Requires:      pam >= 0.99.7.1
 Requires:      which
-Requires:      pam >= 0.79.0
+Requires:      xorg-app-sessreg
 Provides:      group(xdm)
 Provides:      user(xdm)
 Obsoletes:     X11-xdm
 Obsoletes:     entrance
 Obsoletes:     kdm
+Obsoletes:     slim
 Obsoletes:     wdm
 Obsoletes:     xdm
 Conflicts:     gdkxft
@@ -131,9 +133,9 @@ Ten pakiet dodaje do gdm wsparcie dla Xnest.
 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.
@@ -149,6 +151,7 @@ Skrypt init dla GDM-a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %{__libtoolize}
@@ -192,8 +195,6 @@ 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
@@ -207,13 +208,16 @@ rm -rf $RPM_BUILD_ROOT
 
 %pre
 %groupadd -g 55 -r -f xdm
-%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm
+%useradd -u 55 -r -d /home/services/xdm -s /bin/false -c "X Display Manager" -g xdm xdm
 
 %post
 %scrollkeeper_update_post
+%update_icon_cache hicolor
 
 %postun
 %scrollkeeper_update_postun
+%update_icon_cache hicolor
+
 if [ "$1" = "0" ]; then
        %userremove xdm
        %groupremove xdm
@@ -227,17 +231,15 @@ fi
 %post init
 /sbin/chkconfig --add gdm
 if [ -f /var/lock/subsys/gdm ]; then
-        echo "Run \"service gdm restart\" to restart gdm." >&2
-        echo "WARNING: it will terminate all sessions opened from 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 \"service 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