- rel. 4

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

diff --git a/gdm2.20.spec b/gdm2.20.spec
index 4dd66614e01a02578119cd99d3fd0e2f38d249da..1b0b64fff8b4891696e3b051b359655811429d95 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -11,13 +11,13 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.6.0.3
-Release:       3
+Version:       2.6.0.6
+Release:       4
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/%{name}/2.6/%{name}-%{version}.tar.bz2
-# Source0-md5: 2eb8c0fb4289d78fdae686aee3cfbd5c
+# Source0-md5: 8dca7cb1f28d81f60f6e07b3c24288c5
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -28,8 +28,8 @@ Patch0:               %{name}-xdmcp.patch
 Patch1:                %{name}-conf.patch
 Patch2:                %{name}-xsession.patch
 Patch3:                %{name}-logdir.patch
-Patch4:                %{name}-locale-names.patch
-Patch5:                %{name}-default_theme.patch
+Patch4:                %{name}-default_theme.patch
+Patch5:                %{name}-desktop.patch
 URL:           http://www.jirka.org/gdm.html
 BuildRequires: attr-devel
 BuildRequires: autoconf
@@ -48,18 +48,24 @@ BuildRequires:      libtool
 BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
 BuildRequires: perl-modules
+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/userdel
 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:      which
 Requires:      pam >= 0.77.3-7
-Obsoletes:     xdm kdm wdm
+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)
 
@@ -137,8 +143,6 @@ Skrypt init dla GDM-a.
 %patch4 -p1
 %patch5 -p1
 
-mv po/{no,nb}.po
-
 %build
 rm -f missing
 %{__libtoolize}
@@ -179,6 +183,8 @@ 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
@@ -193,16 +199,19 @@ 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
+               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 [ -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 "`/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
@@ -211,10 +220,8 @@ fi
 %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
@@ -260,7 +267,7 @@ fi
 %config %{_sysconfdir}/gdm/PostLogin/Default.sample
 %config %{_sysconfdir}/gdm/modules/*
 
-%config(noreplace)  %verify(not size mtime md5) %{_sysconfdir}/gdm/gdm.conf
+%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