- fixed usage of macros

- added/removed neccesary/obsolete patches
- FHS 2.0 compliance where needed
- gzipping docs where needed

Changed files:
    gdm.spec -> 1.8

diff --git a/gdm.spec b/gdm.spec
index 8a2b9429459a8756287902b6adf58ac4eb8270a3..77d9b2a1894d7f31052971badc1ebba2e7a80d22 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,56 +1,84 @@
-%define ver     1.0.0
-%define rel      2
-%define prefix  /usr
-
-Summary: GNOME Display Manager
-Name: gdm
-Version: %ver
-Release: %rel
-Source: ftp://ftp.socsci.auc.dk/pub/empl/mkp/gdm-%{PACKAGE_VERSION}.tar.gz
-Group: X11/Utilities
-Copyright: LGPL/GPL
+Summary:       GNOME Display Manager
+Name:          gdm
+Version:       1.0.0
+Release:       3
+Source0:       ftp://ftp.socsci.auc.dk/pub/empl/mkp/gdm-%{PACKAGE_VERSION}.tar.gz
+Source1:       gdm.initd
+Source2:       gdm.pamd
+Patch0:                gdm-gnomerc.patch
+Patch1:                gdm-groupwrite.patch
+Patch2:                gdm-installdirs.patch
+Patch3:                gdm-nocompletion.patch
+Patch4:                gdm-rhconf.patch
+Group:         X11/Utilities
+Copyright:     LGPL/GPL
 BuildRoot:     /tmp/%{name}-%{version}-root
-Prefix: %{prefix}
-Docdir: %{prefix}/doc
-Requires: gnome-libs >= 1.0.0
+Requires:      gnome-libs >= 1.0.0
+
+%define                _prefix /usr/X11R6
+%define                _mandir %{_prefix}/man
 
 %description 
 gdm manages local and remote displays and provides the user with a
 graphical login window.
 
 %prep
-%setup
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
-# Needed for snapshot releases.
-if [ ! -f configure ]; then
-       CFLAGS="$RPM_OPT_FLAGS" \
-       ./autogen.sh %{_target_platform} \
-               --prefix=%prefix
-else
-       CFLAGS="$RPM_OPT_FLAGS" \
-       ./configure %{_target_platform} \
-               --prefix=%prefix
-fi
+autoheader
+automake
+autoconf
+CFLAGS="$RPM_OPT_FLAGS" \
+./configure %{_target_platform} \
+       --prefix=%{_prefix} \
+       --sysconfdir=/etc/X11 \
+       --localstatedir=/var/state
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make prefix=$RPM_BUILD_ROOT%{prefix} install
 
-strip $RPM_BUILD_ROOT%{prefix}/bin/* || :
+install -d $RPM_BUILD_ROOT{%{_prefix},/etc/{pam.d,security,rc.d/init.d}}
+
+make install prefix=$RPM_BUILD_ROOT%{_prefix} \
+       sysconfdir=$RPM_BUILD_ROOT/etc/X11 \
+       localstatedir=$RPM_BUILD_ROOT/var/state
+
+#sed -e "s#$RPM_BUILD_ROOT##g" config/gdm.conf >config/gdm.conf.X
+sed -e "s#User=gdm#User=root#g" -e "s#Group=gdm#Group=root#g" \
+       config/gdm.conf >$RPM_BUILD_ROOT/etc/X11/gdm/gdm.conf
+
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/gdm
+touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
+
+strip $RPM_BUILD_ROOT%{_bindir}/* || :
+
+gzip -9nf AUTHORS ChangeLog NEWS README TODO docs/gdm-manual.txt
+
+%find_lang gdm
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files
-%doc AUTHORS COPYING ChangeLog NEWS README TODO docs/gdm-manual.txt
-%defattr(-, gdm, gdm) 
-%{prefix}/bin/gdm
-%{prefix}/bin/gdmgreeter
-%{prefix}/bin/gdmchooser
-%attr (750, gdm, gdm) %{prefix}/var/gdm
-%attr (-,root,root) %{prefix}/share/locale/*/*
-%config %{prefix}/etc/gdm
-%config %{prefix}/etc/gnomerc
+%files -f gdm.lang
+%defattr(644,root,root,755)
+%doc {AUTHORS,ChangeLog,NEWS,README,TODO,docs/gdm-manual.txt}.gz
+%attr(755,root,root) %{_bindir}/gdm
+%attr(755,root,root) %{_bindir}/gdmgreeter
+%attr(755,root,root) %{_bindir}/gdmchooser
+%attr(755,root,root) %config /etc/X11/gdm/Init/*
+%attr(755,root,root) %config /etc/X11/gdm/Sessions/*
+%config /etc/X11/gdm/gnomerc
+%config /etc/X11/gdm/gdm.conf
+%attr(640,root,root) %config %verify(not size mtime md5) /etc/pam.d/gdm
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/security/blacklist.gdm
+%attr(754,root,root) /etc/rc.d/init.d/gdm
+%attr(750,root,root) /var/state/gdm
+%{_datadir}/pixmaps/*