- use macros in %{pre,post}{,un}

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

diff --git a/gdm.spec b/gdm.spec
index 54948efaa07c5228b8f72e3c2db8ef219bc03a78..a299057f8c7e488373f5efcc66922957b58f203f 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,21 +1,18 @@
 Summary:       GNOME Display Manager
 Summary(pl):   gdm
 Name:          gdm
-Version:       2.2.2
-Release:       2
-Source0:       ftp://ftp.gnome.org/pub/GNOME/stable/latest/sources/%{name}-%{version}.tar.gz
-Source1:       %{name}.pamd
-Source2:       %{name}.init
+Version:       2.2.3
+Release:       1
+Epoch:         1
+License:       LGPL/GPL
 Group:         X11/Applications
 Group(de):     X11/Applikationen
 Group(pl):     X11/Aplikacje
-License:       LGPL/GPL
-Prereq:                /usr/sbin/groupadd
-Prereq:                /usr/sbin/groupdel
-Prereq:                /usr/sbin/useradd
-Prereq:                /usr/sbin/userdel
-Prereq:                /sbin/chkconfig
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Source0:       ftp://ftp.gnome.org/pub/GNOME/stable/latest/sources/%{name}-%{version}.tar.gz
+Source1:       %{name}.pamd
+Source2:       %{name}.init
+Source3:       %{name}.conf
+Patch0:                %{name}-xdmcp.patch
 BuildRequires: gnome-libs-devel
 BuildRequires: gtk+-devel
 BuildRequires: esound-devel
@@ -23,14 +20,19 @@ BuildRequires:      gdk-pixbuf-devel
 BuildRequires: libglade-devel
 BuildRequires: libxml-devel
 BuildRequires: perl-modules
+BuildRequires: scrollkeeper
 Requires:      gnome-libs >= 1.0.0
 Requires:      which
 Requires:      /usr/X11R6/bin/sessreg
+Prereq:                scrollkeeper
+Prereq:                shadow
+BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     xdm kdm wdm
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
 %define                _sysconfdir     /etc/X11
+%define                _omf_dest_dir   %(scrollkeeper-config --omfdir)
 
 %description 
 gdm manages local and remote displays and provides the user with a
@@ -42,6 +44,7 @@ u
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 CFLAGS="%{rpmcflags}" \
@@ -49,19 +52,22 @@ CFLAGS="%{rpmcflags}" \
        --prefix=%{_prefix} \
        --sysconfdir=%{_sysconfdir} \
        --localstatedir=/var/lib
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d/ \
+       $RPM_BUILD_ROOT{%{_prefix},/etc/{pam.d,security}}
 
-install -d $RPM_BUILD_ROOT/etc/rc.d/init.d/
-
-install -d $RPM_BUILD_ROOT{%{_prefix},/etc/{pam.d,security}}
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 
 %{__make} install prefix=$RPM_BUILD_ROOT%{_prefix} \
        sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
-       localstatedir=$RPM_BUILD_ROOT/var/lib
+       localstatedir=$RPM_BUILD_ROOT/var/lib \
+       Settingsdir=$RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME \
+       Systemdir=$RPM_BUILD_ROOT%{_applnkdir}/System \
+       omf_dest_dir=$RPM_BUILD_ROOT%{_omf_dest_dir}/omf/%{name}
 
 sed -e "s#$RPM_BUILD_ROOT##g" config/gnomerc >config/gnomerc.X
 install config/gnomerc.X $RPM_BUILD_ROOT%{_sysconfdir}/gdm/gnomerc
@@ -75,56 +81,43 @@ 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
+
 gzip -9nf AUTHORS ChangeLog NEWS README TODO
 
-%find_lang gdm
+%find_lang %{name} --all-name --with-gnome
 
 %pre
-/usr/sbin/groupadd -g 55 -r -f xdm
-
-if [ -z "`id -u xdm 2>/dev/null`" ]; then
-       /usr/sbin/useradd -u 55 -r -d /dev/null -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2
-fi
+GROUP=xdm; GID=55; %groupadd
+USER=xdm; UID=55; HOMEDIR=/dev/null; COMMENT="X Display Manager"; %useradd
 
 %post
-/sbin/chkconfig --add gdm
-if [ -f /var/lock/subsys/gdm ]; then
-        /etc/rc.d/init.d/gdm restart >&2
-else
-        echo "Run \"/etc/rc.d/init.d/gdm start\" to start gdm." >&2
-fi
+%chkconfig_add
+/usr/bin/scrollkeeper-update
 
 %preun
-if [ -f /var/lock/subsys/gdm ]; then
-                /etc/rc.d/init.d/gdm stop >&2
-fi
-/sbin/chkconfig --del gdm
+%chkconfig_del
 
 %postun
-if [ "$1" = "0" ]; then
-
-       if [ -n "`id -u xdm 2>/dev/null`" ]; then
-               /usr/sbin/userdel xdm
-       fi
-       
-       /usr/sbin/groupdel xdm
-
-fi
+USER=xdm; %userdel
+GROUP=xdm; %groupdel
+/usr/bin/scrollkeeper-update
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f gdm.lang
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc {AUTHORS,ChangeLog,NEWS,README,TODO}.gz
-%attr(775,root,xdm) %{_bindir}/gdm
-%attr(775,root,xdm) %{_bindir}/gdmlogin
-%attr(775,root,xdm) %{_bindir}/gdmchooser
+%doc *.gz
+%attr(775,root,xdm) %{_bindir}/*
+%attr(775,root,xdm) %{_sbindir}/*
 %attr(775,root,xdm) %config %{_sysconfdir}/gdm/Init
 %attr(775,root,xdm) %config %{_sysconfdir}/gdm/PreSession
 %attr(775,root,xdm) %config %{_sysconfdir}/gdm/Sessions
 %attr(775,root,xdm) %config %{_sysconfdir}/gdm/PostSession
 %attr(775,root,xdm) %config %{_sysconfdir}/gdm/gnomerc
+%attr(775,root,xdm) %config %{_sysconfdir}/gdm/XKeepsCrashing
+%attr(664,root,xdm) %config %{_sysconfdir}/gdm/factory-gdm.conf
 %attr(664,root,xdm) %config %{_sysconfdir}/gdm/gdm.conf
 %attr(664,root,xdm) %config %{_sysconfdir}/gdm/locale.alias
 %attr(775,root,xdm) %dir %{_sysconfdir}/gdm
@@ -133,3 +126,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(750,xdm,xdm) /var/lib/gdm
 %attr(754,root,root) /etc/rc.d/init.d/gdm
 %{_pixmapsdir}/*
+# these lines to devel subpackage?
+%{_applnkdir}/Settings/GNOME/*
+%{_applnkdir}/System/*
+%{_datadir}/gdm
+%{_omf_dest_dir}/omf/%{name}