From 98b48f20da28cf5a5465e8a68fc48daba298fb5d Mon Sep 17 00:00:00 2001 From: wrobell Date: Wed, 23 Oct 2002 13:15:05 +0000 Subject: [PATCH] - merged from DEVEL - added init with rc scripts stuff subpackage - minor clean up Changed files: gdm.spec -> 1.70 --- gdm.spec | 112 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 45 deletions(-) diff --git a/gdm.spec b/gdm.spec index c9a69fe..21a71e3 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,3 +1,8 @@ +# TODO: +# s=/dev/null=/home/services/xdm= in %%trigger for gracefull upgrade from xdm/kdm/gdm 2.2 +# check /etc/pam.d/gdm-autologin +# + Summary: GNOME Display Manager Summary(es): Administrador de Entrada del GNOME Summary(ja): GNOME ¥Ç¥£¥¹¥×¥ì¥¤¥Þ¥Í¡¼¥¸¥ã @@ -6,34 +11,32 @@ Summary(pt_BR): Gerenciador de Entrada do GNOME Summary(ru): äÉÓÐÌÅÊÎÙÊ ÍÅÎÅÄÖÅÒ GNOME Summary(uk): äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME Name: gdm -Version: 2.2.5.4 -Release: 10 +Version: 2.4.0.11 +Release: 1 Epoch: 1 License: GPL/LGPL Group: X11/Applications -Source0: ftp://ftp.gnome.org/pub/GNOME/stable/sources/%{name}/%{name}-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/GNOME/2.0.1/sources/%{name}/%{name}-%{version}.tar.bz2 Source1: %{name}.pamd Source2: %{name}.init Source3: %{name}.conf Source4: %{name}-pld-logo.png Patch0: %{name}-xdmcp.patch -Patch1: %{name}-am_fixes.patch -Patch2: %{name}-permissions.patch -Patch3: %{name}-omf.patch BuildRequires: autoconf BuildRequires: automake -BuildRequires: esound-devel -BuildRequires: gdk-pixbuf-devel BuildRequires: gettext-devel -BuildRequires: gnome-libs-devel -BuildRequires: gtk+-devel -BuildRequires: intltool >= 0.14 -BuildRequires: libglade-gnome-devel +BuildRequires: gtk+2-devel >= 2.0.6 +BuildRequires: intltool >= 0.22 +BuildRequires: libglade2-devel >= 2.0.1 +BuildRequires: libgnomecanvas-devel >= 2.0.3 +BuildRequires: libgnome-devel >= 2.0.3 +BuildRequires: libgnomeui-devel >= 2.0.4 +BuildRequires: librsvg-devel >= 2.0.1 BuildRequires: libtool -BuildRequires: libxml-devel +BuildRequires: libxml2-devel >= 2.4.24 +BuildRequires: pam-devel BuildRequires: perl-modules -BuildRequires: scrollkeeper -Requires: gnome-libs >= 1.0.0 +BuildRequires: scrollkeeper >= 0.3.11 Requires: which Requires: /usr/X11R6/bin/sessreg Requires(pre): /bin/id @@ -43,6 +46,7 @@ Requires(postun): /usr/sbin/userdel Requires(postun): /usr/sbin/groupdel Requires(post,postun):scrollkeeper Requires(post,preun):/sbin/chkconfig +Conflicts: gdkxft BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: xdm kdm wdm @@ -53,7 +57,6 @@ Obsoletes: xdm kdm wdm %define _mandir %{_prefix}/man %define _localstatedir /var/lib %define _sysconfdir /etc/X11 -%define _omf_dest_dir %(scrollkeeper-config --omfdir) %description Gdm (the GNOME Display Manager) is a highly configurable @@ -103,47 +106,59 @@ This package add support for Xnest server in gdm. %description Xnest -l pl Ten pakiet dodaje do gdm wsparcie dla Xnest. +%package init +Summary: Init script for GDM +Summary(pl): Skrypt init dla GDM-a +Group: X11/Applications +Requires: %{name} = %{version} + +%description init +Init script for GDM. + +%description init -l pl +Skrypt init dla GDM-a. + %prep %setup -q %patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build rm -f missing %{__libtoolize} -%{__gettextize} -intltoolize --copy --force -%{__aclocal} -I %{_aclocaldir}/gnome +glib-gettextize --copy --force +%{__aclocal} %{__autoconf} %{__automake} %configure \ --with-xinerama=yes \ --with-xdmcp=yes \ + --with-pam-prefix=/etc \ --with-tcp-wrappers=yes \ + --enable-authentication-scheme=pam \ --disable-console-helper %{__make} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} +install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security} \ + $RPM_BUILD_ROOT/home/services/xdm %{__make} install \ DESTDIR=$RPM_BUILD_ROOT \ PAM_PREFIX=/etc \ Settingsdir=%{_applnkdir}/Settings/GNOME \ - Systemdir=%{_applnkdir}/System \ - omf_dest_dir=%{_omf_dest_dir}/%{name} + Systemdir=%{_applnkdir}/System install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/gdm.conf + install %{SOURCE4} $RPM_BUILD_ROOT%{_pixmapsdir} + touch $RPM_BUILD_ROOT/etc/security/blacklist.gdm -mv $RPM_BUILD_ROOT%{_applnkdir}/System/gdmconfig.desktop \ +mv $RPM_BUILD_ROOT%{_applnkdir}/System/gdmsetup.desktop \ $RPM_BUILD_ROOT%{_applnkdir}/Settings/GNOME/ %find_lang %{name} --all-name --with-gnome @@ -155,19 +170,30 @@ rm -rf $RPM_BUILD_ROOT /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 + /usr/sbin/useradd -u 55 -r -d /home/services/xdm -s /bin/false -c 'X Display Manager' -g xdm xdm 1>&2 fi %post +/usr/bin/scrollkeeper-update + +%postun +if [ "$1" = "0" ]; then + if [ -n "`id -u xdm 2>/dev/null`" ]; then + /usr/sbin/userdel xdm + fi + /usr/sbin/groupdel xdm +fi +/usr/bin/scrollkeeper-update + +%post init /sbin/chkconfig --add gdm if [ -f /var/lock/subsys/gdm ]; then echo "Run \"/etc/rc.d/init.d/gdm restart\" to restart gdm." >&2 else echo "Run \"/etc/rc.d/init.d/gdm start\" to start gdm." >&2 fi -/usr/bin/scrollkeeper-update -%preun +%preun init if [ "$1" = "0" ]; then if [ -f /var/lock/subsys/gdm ]; then /etc/rc.d/init.d/gdm stop >&2 @@ -175,26 +201,21 @@ if [ "$1" = "0" ]; then /sbin/chkconfig --del gdm 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 -/usr/bin/scrollkeeper-update - %files -f %{name}.lang %defattr(644,root,root,755) %doc AUTHORS ChangeLog NEWS README TODO %attr(755,root,root) %{_bindir}/gdm +%attr(755,root,root) %{_bindir}/gdm-binary %attr(755,root,root) %{_bindir}/gdmchooser -%attr(755,root,root) %{_bindir}/gdmconfig %attr(755,root,root) %{_bindir}/gdmflexiserver +%attr(755,root,root) %{_bindir}/gdmgreeter %attr(755,root,root) %{_bindir}/gdmlogin %attr(755,root,root) %{_bindir}/gdmmktemp %attr(755,root,root) %{_bindir}/gdmphotosetup +%attr(755,root,root) %{_bindir}/gdmsetup +%attr(755,root,root) %{_bindir}/gdmthemetester %attr(755,root,root) %{_sbindir}/* +%dir %{_sysconfdir}/gdm %attr(755,root,root) %config %{_sysconfdir}/gdm/Init %attr(755,root,root) %config %{_sysconfdir}/gdm/PreSession %attr(755,root,root) %config %{_sysconfdir}/gdm/Sessions @@ -204,19 +225,20 @@ fi %config %{_sysconfdir}/gdm/factory-gdm.conf %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/gdm/gdm.conf %config %{_sysconfdir}/gdm/locale.alias -%attr(755,root,root) %dir %{_sysconfdir}/gdm -%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) /etc/pam.d/gdm +%attr(640,root,root) %config(noreplace) %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(770,root,xdm) /var/lib/gdm -%attr(754,root,root) /etc/rc.d/init.d/gdm +%attr(750,xdm,xdm) /var/lib/gdm +%attr(750,xdm,xdm) /home/services/xdm %{_pixmapsdir}/* -# these lines to devel subpackage? %{_applnkdir}/Settings/GNOME/* %{_applnkdir}/System/gdmflexiserver.desktop %{_datadir}/gdm -%{_omf_dest_dir}/%{name} %files Xnest %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/gdmXnestchooser %{_applnkdir}/System/gdmflexiserver-xnest.desktop + +%files init +%defattr(644,root,root,755) +%attr(754,root,root) /etc/rc.d/init.d/gdm -- 2.44.0