- updated to 2.2.5.1 (STBR)

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

diff --git a/gdm2.20.spec b/gdm2.20.spec
index bffe4fdcfa7d0415eb4685b0e3088a35d5b1537a..da25f05e4ae2ad74c7a3ac619b0ac92636ea3b7d 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -1,14 +1,14 @@
 Summary:       GNOME Display Manager
 Summary(pl):   gdm
 Name:          gdm
-Version:       2.2.3
+Version:       2.2.5.1
 Release:       1
 Epoch:         1
 License:       LGPL/GPL
 Group:         X11/Applications
 Group(de):     X11/Applikationen
 Group(pl):     X11/Aplikacje
-Source0:       ftp://ftp.gnome.org/pub/GNOME/stable/latest/sources/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.gnome.org/pub/GNOME/stable/sources/%{name}/%{name}-%{version}.tar.bz2
 Source1:       %{name}.pamd
 Source2:       %{name}.init
 Source3:       %{name}.conf
@@ -26,10 +26,14 @@ Requires:   which
 Requires:      /usr/X11R6/bin/sessreg
 Prereq:                scrollkeeper
 Prereq:                shadow
+Prereq:                /sbin/chkconfig
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     xdm kdm wdm
 
 %define                _prefix         /usr/X11R6
+%define                _bindir         %{_prefix}/bin
+%define                _datadir        %{_prefix}/share
+%define                _sbindir        %{_prefix}/sbin
 %define                _mandir         %{_prefix}/man
 %define                _sysconfdir     /etc/X11
 %define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
@@ -47,7 +51,7 @@ u
 %patch -p1
 
 %build
-CFLAGS="%{rpmcflags}" \
+CFLAGS="%{rpmcflags} -I/usr/X11R6/include/libglade-1.0" \
 ./configure %{_target_platform} \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
@@ -81,12 +85,15 @@ mv -f $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome.X \
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
 touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/X11/%{name}/gdm.conf
+install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/gdm.conf
 
 gzip -9nf AUTHORS ChangeLog NEWS README TODO
 
 %find_lang %{name} --all-name --with-gnome
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %pre
 /usr/sbin/groupadd -g 55 -r -f xdm
 
@@ -104,10 +111,12 @@ fi
 /usr/bin/scrollkeeper-update
 
 %preun
-if [ -f /var/lock/subsys/gdm ]; then
+if [ "$1" = "0" ]; then
+       if [ -f /var/lock/subsys/gdm ]; then
                 /etc/rc.d/init.d/gdm stop >&2
+       fi
+       /sbin/chkconfig --del gdm
 fi
-/sbin/chkconfig --del gdm
 
 %postun
 if [ "$1" = "0" ]; then
@@ -118,9 +127,6 @@ if [ "$1" = "0" ]; then
 fi
 /usr/bin/scrollkeeper-update
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc *.gz