- Updated to 2.0beta4.

- Uses group and user 'xdm' instead of 'gdm'.
- Added initd script.
- Adds and deletes 'xdm' group and user if necessary.
- Obsoletes 'xdm', 'kdm' and 'wdm'.
- Polish description (how to translate 'Display Manager' into polish?).

Changed files:
    gdm.spec -> 1.10
    gdm2.20.spec -> 1.10

diff --git a/gdm.spec b/gdm.spec
index a2a3e264199f3c5053ad3db924a7a76f0d2097de..89156a29eb58b7a53e2f91d7168263269dcd8cd7 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -1,39 +1,47 @@
 Summary:       GNOME Display Manager
+Summary(pl):   gdm
 Name:          gdm
-Version:       2.0.0
+#Version:      2.0.0
+Version:       2.0beta4
 Release:       1
-Source0:       ftp://ftp.socsci.auc.dk/pub/empl/mkp/gdm-%{PACKAGE_VERSION}.tar.gz
+Source0:       ftp://socsci.auc.dk/~mkp/gdm/gdm-2.0beta4.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
+Patch1:                gdm-config.patch
+Group:         X11/GNOME
+Group(pl):     X11/GNOME
 Copyright:     LGPL/GPL
+Prereq:                /usr/sbin/groupadd
+Prereq:                /usr/sbin/groupdel
+Prereq:                /usr/sbin/useradd
+Prereq:                /usr/sbin/userdel
+Prereq:                /sbin/chkconfig
 BuildRoot:     /tmp/%{name}-%{version}-root
+BuildRequires: gnome-libs-devel
 Requires:      gnome-libs >= 1.0.0
+Requires:      which
+Requires:      /usr/X11R6/bin/sessreg
+Obsoletes:     xdm kdm wdm
 
-%define                _prefix /usr/X11R6
-%define                _mandir %{_prefix}/man
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
+%define                _sysconfdir     /etc/X11
 
 %description 
 gdm manages local and remote displays and provides the user with a
 graphical login window.
 
+%description -l pl
+gdm zarz±dza lokalnymi i zdalnymi X serwerami i udostêpnia u¿ytkownikowi
+graficzne okienko logowania.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-autoheader
-automake
-autoconf
 CFLAGS="$RPM_OPT_FLAGS" \
 ./configure %{_target_platform} \
        --prefix=%{_prefix} \
@@ -47,12 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 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 \
+       sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
        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
+sed -e "s#$RPM_BUILD_ROOT##g" config/gnomerc >config/gnomerc.X
+install config/gnomerc.X $RPM_BUILD_ROOT/etc/X11/gdm/gnomerc
+
+sed -e "s#$RPM_BUILD_ROOT##g" $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome \
+       > $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome.X
+
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome.X \
+       $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/gdm
@@ -60,25 +73,56 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 strip $RPM_BUILD_ROOT%{_bindir}/* || :
 
-gzip -9nf AUTHORS ChangeLog NEWS README TODO docs/gdm-manual.txt
+gzip -9nf AUTHORS ChangeLog NEWS README TODO RELEASENOTES
 
 %find_lang gdm
 
+%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
+       if [ -f /var/db/passwd/db ]; then
+               /usr/sbin/update-db 1>&2
+       fi
+fi
+
+%post
+/sbin/chkconfig --add %{name}
+
+%preun
+if [ "$1" = "0" ]; then
+       /sbin/chkconfig --del %{name}
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+       if [ -n "`id -u xdm 2>/dev/null`" ]; then
+               /usr/sbin/userdel xdm
+       fi
+       
+       /usr/sbin/groupdel xdm
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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
+%doc {AUTHORS,ChangeLog,NEWS,README,TODO}.gz
+%attr(755,xdm,xdm) %{_bindir}/gdm
+%attr(755,xdm,xdm) %{_bindir}/gdmlogin
+%attr(755,xdm,xdm) %{_bindir}/gdmchooser
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/Init
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/PreSession
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/Sessions
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/PostSession
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/gnomerc
+%attr(644,xdm,xdm) %config %{_sysconfdir}/gdm/gdm.conf
+%attr(644,xdm,xdm) %config /etc/X11/gdm/locale.alias
+%attr(755,xdm,xdm) %dir %{_sysconfdir}/gdm
 %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
+%attr(750,xdm,xdm) /var/state/gdm
 %{_datadir}/pixmaps/*

diff --git a/gdm2.20.spec b/gdm2.20.spec
index a2a3e264199f3c5053ad3db924a7a76f0d2097de..89156a29eb58b7a53e2f91d7168263269dcd8cd7 100644 (file)
--- a/gdm2.20.spec
+++ b/gdm2.20.spec
@@ -1,39 +1,47 @@
 Summary:       GNOME Display Manager
+Summary(pl):   gdm
 Name:          gdm
-Version:       2.0.0
+#Version:      2.0.0
+Version:       2.0beta4
 Release:       1
-Source0:       ftp://ftp.socsci.auc.dk/pub/empl/mkp/gdm-%{PACKAGE_VERSION}.tar.gz
+Source0:       ftp://socsci.auc.dk/~mkp/gdm/gdm-2.0beta4.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
+Patch1:                gdm-config.patch
+Group:         X11/GNOME
+Group(pl):     X11/GNOME
 Copyright:     LGPL/GPL
+Prereq:                /usr/sbin/groupadd
+Prereq:                /usr/sbin/groupdel
+Prereq:                /usr/sbin/useradd
+Prereq:                /usr/sbin/userdel
+Prereq:                /sbin/chkconfig
 BuildRoot:     /tmp/%{name}-%{version}-root
+BuildRequires: gnome-libs-devel
 Requires:      gnome-libs >= 1.0.0
+Requires:      which
+Requires:      /usr/X11R6/bin/sessreg
+Obsoletes:     xdm kdm wdm
 
-%define                _prefix /usr/X11R6
-%define                _mandir %{_prefix}/man
+%define                _prefix         /usr/X11R6
+%define                _mandir         %{_prefix}/man
+%define                _sysconfdir     /etc/X11
 
 %description 
 gdm manages local and remote displays and provides the user with a
 graphical login window.
 
+%description -l pl
+gdm zarz±dza lokalnymi i zdalnymi X serwerami i udostêpnia u¿ytkownikowi
+graficzne okienko logowania.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-autoheader
-automake
-autoconf
 CFLAGS="$RPM_OPT_FLAGS" \
 ./configure %{_target_platform} \
        --prefix=%{_prefix} \
@@ -47,12 +55,17 @@ rm -rf $RPM_BUILD_ROOT
 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 \
+       sysconfdir=$RPM_BUILD_ROOT%{_sysconfdir} \
        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
+sed -e "s#$RPM_BUILD_ROOT##g" config/gnomerc >config/gnomerc.X
+install config/gnomerc.X $RPM_BUILD_ROOT/etc/X11/gdm/gnomerc
+
+sed -e "s#$RPM_BUILD_ROOT##g" $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome \
+       > $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome.X
+
+mv -f $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome.X \
+       $RPM_BUILD_ROOT%{_sysconfdir}/gdm/Sessions/Gnome
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/gdm
@@ -60,25 +73,56 @@ touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm
 
 strip $RPM_BUILD_ROOT%{_bindir}/* || :
 
-gzip -9nf AUTHORS ChangeLog NEWS README TODO docs/gdm-manual.txt
+gzip -9nf AUTHORS ChangeLog NEWS README TODO RELEASENOTES
 
 %find_lang gdm
 
+%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
+       if [ -f /var/db/passwd/db ]; then
+               /usr/sbin/update-db 1>&2
+       fi
+fi
+
+%post
+/sbin/chkconfig --add %{name}
+
+%preun
+if [ "$1" = "0" ]; then
+       /sbin/chkconfig --del %{name}
+fi
+
+%postun
+if [ "$1" = "0" ]; then
+       if [ -n "`id -u xdm 2>/dev/null`" ]; then
+               /usr/sbin/userdel xdm
+       fi
+       
+       /usr/sbin/groupdel xdm
+fi
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %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
+%doc {AUTHORS,ChangeLog,NEWS,README,TODO}.gz
+%attr(755,xdm,xdm) %{_bindir}/gdm
+%attr(755,xdm,xdm) %{_bindir}/gdmlogin
+%attr(755,xdm,xdm) %{_bindir}/gdmchooser
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/Init
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/PreSession
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/Sessions
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/PostSession
+%attr(755,xdm,xdm) %config %{_sysconfdir}/gdm/gnomerc
+%attr(644,xdm,xdm) %config %{_sysconfdir}/gdm/gdm.conf
+%attr(644,xdm,xdm) %config /etc/X11/gdm/locale.alias
+%attr(755,xdm,xdm) %dir %{_sysconfdir}/gdm
 %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
+%attr(750,xdm,xdm) /var/state/gdm
 %{_datadir}/pixmaps/*