- use %useradd/%groupadd macros

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

diff --git a/gdm2.20.spec b/gdm2.20.spec
index 05440e6155629a35761cfacc4fc7335a71bb13bb..f02d7592e1f21758200ae166a7ad7506a62ebf5b 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -14,13 +14,13 @@ Summary(pt_BR):     Gerenciador de Entrada do GNOME
 Summary(ru):   äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
-Version:       2.6.0.8
-Release:       2
+Version:       2.6.0.9
+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: 2c51b452686378097bb58e5fc02e2d04
+# Source0-md5: d845fe205412bb101d4c66d1e88a317d
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}-pld-logo.png
@@ -34,6 +34,7 @@ Patch2:               %{name}-xsession.patch
 Patch3:                %{name}-logdir.patch
 Patch4:                %{name}-default_theme.patch
 Patch5:                %{name}-desktop.patch
+patch6:                %{name}-vt_9.patch
 URL:           http://www.jirka.org/gdm.html
 BuildRequires: attr-devel
 BuildRequires: autoconf
@@ -52,8 +53,7 @@ BuildRequires:        libtool
 BuildRequires: libxml2-devel >= 2.5.11
 BuildRequires: pam-devel
 BuildRequires: perl-modules
-BuildRequires: rpmbuild(macros) >= 1.159
-BuildRequires: scrollkeeper
+BuildRequires: rpmbuild(macros) >= 1.202
 Requires(pre): /bin/id
 Requires(pre): /usr/sbin/groupadd
 Requires(pre): /usr/sbin/useradd
@@ -147,12 +147,12 @@ Skrypt init dla GDM-a.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
-rm -f missing
 %{__libtoolize}
-glib-gettextize --copy --force
-intltoolize --copy --force
+%{__glib_gettextize}
+%{__intltoolize}
 %{__aclocal}
 %{__autoconf}
 %{__automake}
@@ -203,28 +203,14 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
 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
-/usr/bin/scrollkeeper-update
+%scrollkeeper_update_post
 
 %postun
-/usr/bin/scrollkeeper-update
+%scrollkeeper_update_postun
 if [ "$1" = "0" ]; then
        %userremove xdm
        %groupremove xdm