- wersja developerska 2.0.0

Changed files:
    gdm.spec -> 1.5.2.1

diff --git a/gdm.spec b/gdm.spec
index 8a2b9429459a8756287902b6adf58ac4eb8270a3..17c5161f361c370e3acc9ed3ebfb924443a8a503 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,56 +1,79 @@
-%define ver     1.0.0
-%define rel      2
+%define ver     2.0.0
+%define rel     1
 %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
-BuildRoot:     /tmp/%{name}-%{version}-root
-Prefix: %{prefix}
-Docdir: %{prefix}/doc
-Requires: gnome-libs >= 1.0.0
+Summary:     GNOME Display Manager
+Name:        gdm
+Version:     %ver
+Release:     %rel
+Source:      ftp://ftp.socsci.auc.dk/pub/empl/mkp/gdm-%{PACKAGE_VERSION}.tar.gz
+Patch:       gdm-correct.patch
+Group:       X11/Utilities
+Copyright:   LGPL/GPL
+BuildRoot:   /tmp/%{name}-%{version}-root
+Prefix:      %{prefix}
+Docdir:      %{prefix}/doc
+Requires:    gnome-libs >= 1.0.0
 
 %description 
 gdm manages local and remote displays and provides the user with a
 graphical login window.
 
 %prep
-%setup
+%setup -q
+%patch -p1
 
 %build
 # Needed for snapshot releases.
 if [ ! -f configure ]; then
        CFLAGS="$RPM_OPT_FLAGS" \
-       ./autogen.sh %{_target_platform} \
-               --prefix=%prefix
+       ./autogen.sh \
+               --prefix=%prefix \
+               --sysconfdir=/etc/X11
 else
        CFLAGS="$RPM_OPT_FLAGS" \
-       ./configure %{_target_platform} \
-               --prefix=%prefix
+       ./configure \
+               --prefix=%prefix \
+               --sysconfdir=/etc/X11
 fi
+
 make
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make prefix=$RPM_BUILD_ROOT%{prefix} install
+mkdir -p $RPM_BUILD_ROOT/{%{prefix},etc/pam.d,etc/X11}
+make prefix=$RPM_BUILD_ROOT%{prefix} \
+     authdir=$RPM_BUILD_ROOT/var/gdm \
+     sysconfdir=$RPM_BUILD_ROOT/etc/X11 install
+install  $RPM_BUILD_DIR/%{name}-*/config/gdm $RPM_BUILD_ROOT/etc/pam.d
 
 strip $RPM_BUILD_ROOT%{prefix}/bin/* || :
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+if ! `grep gdm /etc/passwd >/dev/null 2>&1`; then
+    if ! `grep gdm /etc/group >/dev/null 2>&1`; then
+       groupadd -g 60 -f gdm >/dev/null 2>&1 || :
+    fi
+    useradd -M -o -r -d /var/gdm -g gdm -u 60 -s /bin/bash \
+       -c "gdm user" gdm >/dev/null 2>&1 || :
+fi
+
 %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
+%doc AUTHORS ChangeLog NEWS README TODO docs/gdm-manual.txt
+%defattr(644, root, root, 755) 
+%config %attr (755, root, root) /etc/X11/gdm/Init
+%config %attr (755, root, root) /etc/X11/gdm/Sessions
+%config /etc/X11/gdm/gdm.conf
+%config /etc/X11/gdm/locale.alias
+%config %attr (755, root, root) /etc/X11/gnomerc
+/etc/pam.d/gdm
+%attr (750, root, root) %{prefix}/bin/gdm
+%attr (750, root, root) %{prefix}/bin/gdmgreeter
+%attr (750, root, root) %{prefix}/bin/gdmchooser
+%attr (750, root, root) %{prefix}/bin/gdmlogin
+%attr (750, gdm, gdm)   /var/gdm
+%{prefix}/share/locale/*/*
+%{prefix}/share/pixmaps/*