First attempt at making an rpm. Doesn't break the build, but I doubt it

Fri Feb 02 20:03:49 2001  George Lebl <jirka@5z.com>

	* configure.in, config/Default.redhat, config/Failsafe.redhat,
	  config/Failsafe.in, config/Makefile.am, gdm.spec.in:  First
	  attempt at making an rpm.  Doesn't break the build, but I doubt
	  it works as I haven't tried it.  Will test on my laptop later.

7 files changed, 264 insertions, 6 deletions

diff --git a/.cvsignore b/.cvsignore
index bf1ec9d3..7e8a0eee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -29,3 +29,4 @@ install-sh
 stamp-h.in
 stamp.h.in
 intl
+gdm.spec
diff --git a/ChangeLog b/ChangeLog
index a775acd3..607cecbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 02 20:03:49 2001  George Lebl <jirka@5z.com>
+
+	* configure.in, config/Default.redhat, config/Failsafe.redhat,
+	  config/Failsafe.in, config/Makefile.am, gdm.spec.in:  First
+	  attempt at making an rpm.  Doesn't break the build, but I doubt
+	  it works as I haven't tried it.  Will test on my laptop later.
+
 Fri Feb 02 18:29:40 2001  George Lebl <jirka@5z.com>
 
 	* gui/gdmlogin.c: the xinerama support might badmach if run under
diff --git a/Makefile.am b/Makefile.am
index e906dacb..fc1a6f85 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
 SUBDIRS = config macros pixmaps daemon gui docs intl po
 
-EXTRA_DIST = ChangeLog README.install RELEASENOTES
+EXTRA_DIST = ChangeLog README.install RELEASENOTES gdm.spec gdm.spec.in
 
diff --git a/config/Failsafe.in b/config/Failsafe.in
new file mode 100755
index 00000000..f8489c35
--- /dev/null
+++ b/config/Failsafe.in
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exec $(sessdir)/Xsession failsafe
diff --git a/config/Makefile.am b/config/Makefile.am
index a14ab01e..e95c56eb 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -4,7 +4,7 @@ localedir = $(sysconfdir)/gdm
 sessdir = $(sysconfdir)/gdm/Sessions
 initdir = $(sysconfdir)/gdm/Init
 authdir = $(localstatedir)/gdm
-gnomercdir = $(sysconfdir)
+gnomercdir = $(sysconfdir)/gdm
 postdir = $(sysconfdir)/gdm/PostSession
 predir = $(sysconfdir)/gdm/PreSession
 
@@ -24,6 +24,11 @@ Gnome: Gnome.in Makefile
 	    < $(srcdir)/Gnome.in > Gnome.tmp \
 	    && mv -f Gnome.tmp Gnome
 
+Failsafe: Failsafe.in Makefile
+	sed -e 's,\@sessdir\@,$(sessdir),g' \
+	    < $(srcdir)/Failsafe.in > Failsafe.tmp \
+	    && mv -f Failsafe.tmp Gnome
+
 gnomerc: gnomerc.in Makefile
 	sed -e 's,\@bindir\@,$(bindir),g' \
 	    < $(srcdir)/gnomerc.in > gnomerc.tmp \
@@ -36,11 +41,14 @@ EXTRA_DIST = \
 	Gnome.in \
 	gnomerc.in \
 	Xsession \
+	Failsafe.in \
 	gdm \
 	locale.alias \
 	Default \
 	PostSession \
-	PreSession
+	PreSession \
+	Default.redhat \
+	Failsafe.redhat
 
 install-data-hook: gdm.conf gnomerc Gnome
 	if test '!' -d $(confdir); then \
@@ -63,7 +71,10 @@ install-data-hook: gdm.conf gnomerc Gnome
 		$(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \
 	fi
 	if test '!' -f $(sessdir)/Gnome; then \
-		$(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome; \
+		$(INSTALL_SCRIPT) $(srcdir)/Gnome $(sessdir)/Gnome; \
+	fi
+	if test '!' -f $(sessdir)/Failsafe; then \
+		$(INSTALL_SCRIPT) $(srcdir)/Failsafe.session $(sessdir)/Failsafe; \
 	fi
 
 	if test '!' -d $(initdir); then \
@@ -95,7 +106,7 @@ install-data-hook: gdm.conf gnomerc Gnome
 		chmod 755 $(gnomercdir); \
 	fi
 	if test '!' -f $(gnomercdir)/gnomerc; then \
-		$(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \
+		$(INSTALL_SCRIPT) $(srcdir)/gnomerc $(gnomercdir)/gnomerc; \
 	fi
 
 	if test '!' -d $(authdir); then \
diff --git a/configure.in b/configure.in
index 61d06143..6a625e48 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(daemon/gdm.h)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.0.97)
+AM_INIT_AUTOMAKE(gdm,2.0.97.1)
 AM_MAINTAINER_MODE
 AM_ACLOCAL_INCLUDE(macros)
 
@@ -146,6 +146,7 @@ docs/Makefile
 docs/C/Makefile
 po/Makefile.in
 intl/Makefile
+gdm.spec
 ],[sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
 
 
diff --git a/gdm.spec.in b/gdm.spec.in
new file mode 100644
index 00000000..fb39cbb2
--- /dev/null
+++ b/gdm.spec.in
@@ -0,0 +1,235 @@
+#
+# This was based on the RedHat gdm2 beta2 rpm package with some surgery
+# -George
+#
+# Note that this is NOT a relocatable package
+#
+
+%define ver      @VERSION@
+%define rel      1
+%define prefix   /usr
+
+Summary: The GNOME Display Manager.
+Name: gdm
+Version: %ver
+Release: %rel
+Copyright: LGPL/GPL
+Group: User Interface/X
+Source: ftp://ftp.5z.com/pub/unix/gdm-%{PACKAGE_VERSION}.tar.gz
+
+BuildRoot: /var/tmp/gdm-%{PACKAGE_VERSION}-root
+
+Prereq: /usr/sbin/useradd
+Requires: pam >= 0.68
+Requires: gnome-libs >= 1.0.17
+
+Docdir: %{prefix}/doc
+
+%description
+Gdm (the GNOME Display Manager) is a highly configurable
+reimplementation of xdm, the X Display Manager. Gdm allows you to log
+into your system with the X Window System running and supports running
+several different X sessions on your local machine at the same time.
+
+%prep
+%setup -q
+
+%build
+CFLAGS="-g $RPM_OPT_FLAGS" ./configure --prefix=%prefix --sysconfdir=/etc/X11 --localstatedir=/var
+make
+(cd config; make gdm.conf gnomerc Gnome Failsafe)
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+/usr/sbin/useradd -r gdm > /dev/null 2>&1 || /bin/true
+
+make prefix=$RPM_BUILD_ROOT%{prefix} sysconfdir=$RPM_BUILD_ROOT/etc/X11 localstatedir=$RPM_BUILD_ROOT/var install
+# docs go elsewhere
+rm -rf $RPM_BUILD_ROOT/%{prefix}/doc
+
+# install RH specific session files
+rm -f $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/*
+
+install -m 755 config/Default.redhat $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/Default
+install -m 755 config/Gnome $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/Gnome
+install -m 755 config/Failsafe.redhat $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/Failsafe
+ln -sf Default $RPM_BUILD_ROOT/etc/X11/gdm/Sessions/default
+
+# change default Init script to be Red Hat default
+ln -sf ../../xdm/Xsetup_0 $RPM_BUILD_ROOT/etc/X11/gdm/Init/Default
+
+# run GiveConsole/TakeConsole
+mkdir $RPM_BUILD_ROOT/etc/X11/gdm/PreSession
+mkdir $RPM_BUILD_ROOT/etc/X11/gdm/PostSession
+ln -sf ../../xdm/GiveConsole $RPM_BUILD_ROOT/etc/X11/gdm/PreSession/Default
+ln -sf ../../xdm/TakeConsole $RPM_BUILD_ROOT/etc/X11/gdm/PostSession/Default
+
+# move pam.d stuff to right place
+mv $RPM_BUILD_ROOT/etc/X11/pam.d $RPM_BUILD_ROOT/etc
+
+# strip binaries
+strip $RPM_BUILD_ROOT%{prefix}/bin/*
+
+%clean
+[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
+
+%pre
+/usr/sbin/useradd -u 42 -r gdm > /dev/null 2>&1
+# ignore errors, as we can't disambiguate between gdm already existed
+# and couldn't create account with the current adduser.
+exit 0
+
+%files
+%defattr(-, root, root)
+
+%doc AUTHORS COPYING ChangeLog NEWS README
+%{prefix}/bin/*
+%config /etc/pam.d/gdm
+%config /etc/X11/gdm/gnomerc
+%config /etc/X11/gdm/gdm.conf
+%config /etc/X11/gdm/locale.alias
+%config /etc/X11/gdm/Sessions/*
+%config /etc/X11/gdm/Init/*
+%config /etc/X11/gdm/PreSession/*
+%config /etc/X11/gdm/PostSession/*
+%{prefix}/share/locale/*/*/*
+%{prefix}/share/pixmaps/*
+%attr(750, gdm, gdm) %dir /var/gdm
+
+%changelog
+* Fri Feb 02 2001 George Lebl <jirka@5z.com>
+- Remove all the patches and do the voodoo that I don't do so well
+  to make this thingie work with 2.0.97.1
+
+* Fri Feb 04 2000 Havoc Pennington <hp@redhat.com>
+- Modify Default.session and Failsafe.session not to add -login option to bash
+- exec the session scripts with the user's shell with a hyphen prepended
+- doesn't seem to actually work yet with tcsh, but it doesn't seem to 
+  break anything. needs a look to see why it doesn't work
+
+* Fri Feb 04 2000 Havoc Pennington <hp@redhat.com>
+- Link PreSession/Default to xdm/GiveConsole
+- Link PostSession/Default to xdm/TakeConsole
+
+* Fri Feb 04 2000 Havoc Pennington <hp@redhat.com>
+- Fix the fix to the fix (8877)
+- remove docs/gdm-manual.txt which doesn't seem to exist from %doc
+
+* Fri Feb 04 2000 Havoc Pennington <hp@redhat.com>
+- Enhance 8877 fix by not deleting the "Please login" 
+  message
+
+* Fri Feb 04 2000 Havoc Pennington <hp@redhat.com>
+- Try to fix bug 8877 by clearing the message below 
+  the entry box when the prompt changes. may turn 
+  out to be a bad idea.
+
+* Mon Jan 17 2000 Elliot Lee <sopwith@redhat.com>
+- Fix bug #7666: exec Xsession instead of just running it
+
+* Mon Oct 25 1999 Jakub Jelinek <jakub@redhat.com>
+- Work around so that russian works (uses koi8-r instead
+  of the default iso8859-5)
+
+* Tue Oct 12 1999 Owen Taylor <otaylor@redhat.com>
+- Try again
+
+* Tue Oct 12 1999 Owen Taylor <otaylor@redhat.com>
+- More fixes for i18n
+
+* Tue Oct 12 1999 Owen Taylor <otaylor@redhat.com>
+- Fixes for i18n
+
+* Fri Sep 26 1999 Elliot Lee <sopwith@redhat.com>
+- Fixed pipewrite bug (found by mkj & ewt).
+
+* Fri Sep 17 1999 Michael Fulbright <drmike@redhat.com>
+- added requires for pam >= 0.68
+
+* Fri Sep 10 1999 Elliot Lee <sopwith@redhat.com>
+- I just update this package every five minutes, so any recent changes are my fault.
+
+* Thu Sep 02 1999 Michael K. Johnson <johnsonm@redhat.com>
+- built gdm-2.0beta2
+
+* Mon Aug 30 1999 Michael K. Johnson <johnsonm@redhat.com>
+- built gdm-2.0beta1
+
+* Tue Aug 17 1999 Michael Fulbright <drmike@redhat.com>
+- included rmeier@liberate.com patch for tcp socket X connections
+
+* Mon Apr 19 1999 Michael Fulbright <drmike@redhat.com>
+- fix to handling ancient gdm config files with non-standard language specs
+- dont close display connection for xdmcp connections, else we die if remote
+  end dies. 
+
+* Fri Apr 16 1999 Michael Fulbright <drmike@redhat.com>
+- fix language handling to set GDM_LANG variable so gnome-session 
+  can pick it up
+
+* Wed Apr 14 1999 Michael Fulbright <drmike@redhat.com>
+- fix so certain dialog boxes dont overwrite background images
+
+* Wed Apr 14 1999 Michael K. Johnson <johnsonm@redhat.com>
+- do not specify -r 42 to useradd -- it doesn't know how to fall back
+  if id 42 is already taken
+
+* Fri Apr 9 1999 Michael Fulbright <drmike@redhat.com>
+- removed suspend feature
+
+* Mon Apr 5 1999 Jonathan Blandford <jrb@redhat.com>
+- added patch from otaylor to not call gtk funcs from a signal.
+- added patch to tab when username not added.
+- added patch to center About box (and bring up only one) and ignore "~"
+  and ".rpm" files.
+
+* Fri Mar 26 1999 Michael Fulbright <drmike@redhat.com>
+- fixed handling of default session, merged all gdmgreeter patches into one
+
+* Tue Mar 23 1999 Michael Fulbright <drmike@redhat.com>
+- remove GNOME/KDE/AnotherLevel session scripts, these have been moved to
+  the appropriate packages instead.
+- added patch to make option menus always active (security problem otherwise)
+- added jrb's patch to disable stars in passwd entry field
+
+* Fri Mar 19 1999 Michael Fulbright <drmike@redhat.com>
+- made sure /usr/bin isnt in default path twice
+- strip binaries
+
+* Wed Mar 17 1999 Michael Fulbright <drmike@redhat.com>
+- fixed to use proper system path when root logs in
+
+* Tue Mar 16 1999 Michael Fulbright <drmike@redhat.com>
+- linked Init/Default to Red Hat default init script for xdm
+- removed logo from login dialog box
+
+* Mon Mar 15 1999 Michael Johnson <johnsonm@redhat.com>
+- pam_console integration
+
+* Tue Mar 09 1999 Michael Fulbright <drmike@redhat.com>
+- added session files for GNOME/KDE/AnotherLevel/Default/Failsafe
+- patched gdmgreeter to not complete usernames
+- patched gdmgreeter to not safe selected session permanently
+- patched gdmgreeter to center dialog boxes
+
+* Mon Mar 08 1999 Michael Fulbright <drmike@redhat.com>
+- removed comments from gdm.conf file, these are not parsed correctly
+
+* Sun Mar 07 1999 Michael Fulbright <drmike@redhat.com>
+- updated source line for accuracy
+
+* Fri Feb 26 1999 Owen Taylor <otaylor@redhat.com>
+- Updated patches for 1.0.0
+- Fixed some problems in 1.0.0 with installation directories
+- moved /usr/var/gdm /var/gdm
+
+* Thu Feb 25 1999 Michael Fulbright <drmike@redhat.com>
+- moved files from /usr/etc to /etc
+
+* Tue Feb 16 1999 Michael Johnson <johnsonm@redhat.com>
+- removed commented-out #1 definition -- put back after testing gnome-libs
+  comment patch
+
+* Sat Feb 06 1999 Michael Johnson <johnsonm@redhat.com>
+- initial packaging