This commit was manufactured by cvs2git to create branch 'RA-branch'.

Sprout from master 2002-10-02 01:05:33 UTC kloczek <kloczek@pld-linux.org> '- run gdm always on vt9.'
Cherrypick from STABLE 2002-10-27 17:32:55 UTC misto <misto@pld-linux.org> '- fixed Sessions/Default. It was executing not existing Xsession script,':
    gdm-am_fixes.patch -> 1.1.2.1
Cherrypick from unlabeled-1.67.2 2002-10-27 17:28:30 UTC misto <misto@pld-linux.org> '- FIXED gdm-am_fixes.patch - corrected Session/Default.':
    gdm.spec -> 1.67.2.1
Delete:
    gdm-DESTDIR.patch

diff --git a/gdm-DESTDIR.patch b/gdm-DESTDIR.patch
deleted file mode 100644 (file)
index a7eef8e..0000000
--- a/gdm-DESTDIR.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- gdm-2.3.90.2/config/Makefile.am.wiget      Mon May 20 03:08:44 2002
-+++ gdm-2.3.90.2/config/Makefile.am    Mon May 20 03:16:27 2002
-@@ -31,84 +31,84 @@
-       cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h
- 
- install-data-hook: gdm.conf gnomerc Gnome
--      if test '!' -d $(confdir); then \
--              $(mkinstalldirs) $(confdir); \
--              chmod 755 $(confdir); \
-+      if test '!' -d $(DESTDIR)$(confdir); then \
-+              $(mkinstalldirs) $(DESTDIR)$(confdir); \
-+              chmod 755 $(DESTDIR)$(confdir); \
-       fi
--      if test '!' -f $(confdir)/gdm.conf; then \
--              $(INSTALL_DATA) gdm.conf $(confdir)/gdm.conf; \
-+      if test '!' -f $(DESTDIR)$(confdir)/gdm.conf; then \
-+              $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/gdm.conf; \
-       fi
--      $(INSTALL_DATA) gdm.conf $(confdir)/factory-gdm.conf
-+      $(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf
- 
--      $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(confdir)/XKeepsCrashing
-+      $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
- 
--      -if test -f $(localedir)/locale.alias; then \
--              cp $(localedir)/locale.alias $(localedir)/locale.alias.orig; \
-+      -if test -f $(DESTDIR)$(localedir)/locale.alias; then \
-+              cp $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
-       fi
--      $(INSTALL_DATA) $(srcdir)/locale.alias $(localedir)/locale.alias
-+      $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias
- 
--      if test '!' -d $(sessdir); then \
--              $(mkinstalldirs) $(sessdir); \
--              chmod 755 $(sessdir); \
-+      if test '!' -d $(DESTDIR)$(sessdir); then \
-+              $(mkinstalldirs) $(DESTDIR)$(sessdir); \
-+              chmod 755 $(DESTDIR)$(sessdir); \
-       fi
- 
--      -if test -f $(sessdir)/Xsession; then \
--              cp $(sessdir)/Xsession $(sessdir)/Xsession.orig; \
-+      -if test -f $(DESTDIR)$(sessdir)/Xsession; then \
-+              cp $(DESTDIR)$(sessdir)/Xsession $(DESTDIR)$(sessdir)/Xsession.orig; \
-       fi
--      $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession
-+      $(INSTALL_SCRIPT) $(srcdir)/Xsession $(DESTDIR)$(sessdir)/Xsession
- 
--      -if test -f $(sessdir)/Gnome; then \
--              cp $(sessdir)/Gnome $(sessdir)/Gnome.orig; \
-+      -if test -f $(DESTDIR)$(sessdir)/Gnome; then \
-+              cp $(DESTDIR)$(sessdir)/Gnome $(DESTDIR)$(sessdir)/Gnome.orig; \
-       fi
--      $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome
-+      $(INSTALL_SCRIPT) Gnome $(DESTDIR)$(sessdir)/Gnome
- 
-       -if test -f /etc/redhat-release; then \
--              if test -f $(sessdir)/Default; then \
--                      cp $(sessdir)/Default $(sessdir)/Default.orig; \
-+              if test -f $(DESTDIR)$(sessdir)/Default; then \
-+                      cp $(DESTDIR)$(sessdir)/Default $(DESTDIR)$(sessdir)/Default.orig; \
-               fi; \
--              $(INSTALL_SCRIPT) $(srcdir)/Default.redhat $(sessdir)/Default; \
-+              $(INSTALL_SCRIPT) $(srcdir)/Default.redhat $(DESTDIR)$(sessdir)/Default; \
-       fi
- 
--      if test '!' -d $(initdir); then \
--              $(mkinstalldirs) $(initdir); \
--              chmod 755 $(initdir); \
-+      if test '!' -d $(DESTDIR)$(initdir); then \
-+              $(mkinstalldirs) $(DESTDIR)$(initdir); \
-+              chmod 755 $(DESTDIR)$(initdir); \
-       fi
--      -if test -f $(initdir)/Default; then \
--              cp $(initdir)/Default $(initdir)/Default.orig; \
-+      -if test -f $(DESTDIR)$(initdir)/Default; then \
-+              cp $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
-       fi
--      $(INSTALL_SCRIPT) $(srcdir)/Default $(initdir)/Default
-+      $(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default
- 
--      if test '!' -d $(predir); then \
--              $(mkinstalldirs) $(predir); \
--              chmod 755 $(predir); \
-+      if test '!' -d $(DESTDIR)$(predir); then \
-+              $(mkinstalldirs) $(DESTDIR)$(predir); \
-+              chmod 755 $(DESTDIR)$(predir); \
-       fi
--      -if test -f $(predir)/Default; then \
--              cp $(predir)/Default $(predir)/Default.orig; \
-+      -if test -f $(DESTDIR)$(predir)/Default; then \
-+              cp $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
-       fi
--      $(INSTALL_SCRIPT) $(srcdir)/PreSession $(predir)/Default
-+      $(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default
- 
--      if test '!' -d $(postdir); then \
--              $(mkinstalldirs) $(postdir); \
--              chmod 755 $(postdir); \
-+      if test '!' -d $(DESTDIR)$(postdir); then \
-+              $(mkinstalldirs) $(DESTDIR)$(postdir); \
-+              chmod 755 $(DESTDIR)$(postdir); \
-       fi
--      -if test -f $(postdir)/Default; then \
--              cp $(postdir)/Default $(postdir)/Default.orig; \
-+      -if test -f $(DESTDIR)$(postdir)/Default; then \
-+              cp $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
-       fi
--      $(INSTALL_SCRIPT) $(srcdir)/PostSession $(postdir)/Default
-+      $(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default
- 
--      if test '!' -d $(gnomercdir); then \
--              $(mkinstalldirs) $(gnomercdir); \
--              chmod 755 $(gnomercdir); \
-+      if test '!' -d $(DESTDIR)$(gnomercdir); then \
-+              $(mkinstalldirs) $(DESTDIR)$(gnomercdir); \
-+              chmod 755 $(DESTDIR)$(gnomercdir); \
-       fi
- 
--      if test '!' -f $(gnomercdir)/gnomerc; then \
--              $(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \
-+      if test '!' -f $(DESTDIR)$(gnomercdir)/gnomerc; then \
-+              $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc; \
-       fi
- 
--      if test '!' -d $(authdir); then \
--              $(mkinstalldirs) $(authdir); \
--              chown gdm.gdm $(authdir); \
--              chmod 750 $(authdir); \
-+      if test '!' -d $(DESTDIR)$(authdir); then \
-+              $(mkinstalldirs) $(DESTDIR)$(authdir); \
-+              chown gdm.gdm $(DESTDIR)$(authdir) || true ; \
-+              chmod 750 $(DESTDIR)$(authdir); \
-       fi
- 
-       system=`uname`; \

diff --git a/gdm-am_fixes.patch b/gdm-am_fixes.patch
index ba4c8a73f5520171d254a92e9bd6fe67616d8af7..ceb68d70477476941d9b7f2890f41e546de5cd06 100644 (file)
--- a/gdm-am_fixes.patch
+++ b/gdm-am_fixes.patch
@@ -1,6 +1,7 @@
---- gdm-2.2.5.4/config/Makefile.am~    Tue Jan 29 02:28:03 2002
-+++ gdm-2.2.5.4/config/Makefile.am     Tue Jan 29 02:28:03 2002
-@@ -31,85 +31,25 @@
+diff -u -r gdm-2.2.5.4/config/Makefile.am gdm-2.2.5.4.new/config/Makefile.am
+--- gdm-2.2.5.4/config/Makefile.am     Fri Dec  7 06:15:49 2001
++++ gdm-2.2.5.4.new/config/Makefile.am Sun Oct 27 13:02:32 2002
+@@ -31,85 +31,26 @@
        cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h
  
  install-data-hook: gdm.conf gnomerc Gnome
@@ -97,7 +98,8 @@
 +      $(INSTALL_SCRIPT) PreSession $(DESTDIR)$(predir)/Default
 +      $(INSTALL_SCRIPT) PostSession $(DESTDIR)$(postdir)/Default
 +      $(INSTALL_SCRIPT) gnomerc $(DESTDIR)$(gnomercdir)/gnomerc
-+      $(INSTALL_SCRIPT) Default.redhat $(DESTDIR)$(sessdir)/Default
++      (echo "#!/bin/sh"; echo; echo "exec $(sessdir)/Xsession") > Default.pld
++      $(INSTALL_SCRIPT) Default.pld $(DESTDIR)$(sessdir)/Default
 +
 +      chown gdm $(DESTDIR)$(authdir) || :
 +      chogrp gdm $(DESTDIR)$(authdir) || :
@@ -105,7 +107,7 @@
  
        system=`uname`; \
        if test -f /usr/include/security/pam_appl.h; then \
-@@ -124,6 +64,6 @@
+@@ -124,6 +65,6 @@
                $(INSTALL_DATA) gdm-autologin $(DESTDIR)$(PAM_PREFIX)/pam.d/gdm-autologin; \
           fi; \
           if test $$system = SunOS; then \
@@ -113,8 +115,9 @@
 +              echo "Please add PAM authentication for gdm and gdm-autologin in $(DESTDIR)$(PAM_PREFIX)/pam.conf!"; \
           fi; \
        fi
---- gdm-2.2.5.4/daemon/Makefile.am~    Tue Jan 29 02:32:48 2002
-+++ gdm-2.2.5.4/daemon/Makefile.am     Tue Jan 29 02:32:48 2002
+diff -u -r gdm-2.2.5.4/daemon/Makefile.am gdm-2.2.5.4.new/daemon/Makefile.am
+--- gdm-2.2.5.4/daemon/Makefile.am     Wed Dec  5 01:24:16 2001
++++ gdm-2.2.5.4.new/daemon/Makefile.am Sun Oct 27 13:01:00 2002
 @@ -1,9 +1,6 @@
  ## Process this file with automake to produce makefile.in
 -CFLAGS = @CFLAGS@ -g -Wall \
@@ -126,8 +129,9 @@
  
  INCLUDES = \
        -I.                                             \
---- gdm-2.2.5.4/docs/sgmldocs.make~    Tue Jan 29 02:41:23 2002
-+++ gdm-2.2.5.4/docs/sgmldocs.make     Tue Jan 29 02:41:23 2002
+diff -u -r gdm-2.2.5.4/docs/sgmldocs.make gdm-2.2.5.4.new/docs/sgmldocs.make
+--- gdm-2.2.5.4/docs/sgmldocs.make     Fri Aug 24 09:18:15 2001
++++ gdm-2.2.5.4.new/docs/sgmldocs.make Sun Oct 27 13:01:00 2002
 @@ -58,7 +58,7 @@
        -cp $(docname)/index.html .
  

diff --git a/gdm.spec b/gdm.spec
index 1542888f3ef340489681eba691a716907a320fbb..8886f5b74d234cf0647c3db08afbb4d4684ef0e2 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -7,7 +7,7 @@ Summary(ru):    
 Summary(uk):   äÉÓÐÌÅÊÎÉÊ ÍÅÎÅÄÖÅÒ GNOME
 Name:          gdm
 Version:       2.2.5.4
-Release:       8
+Release:       11
 Epoch:         1
 License:       GPL/LGPL
 Group:         X11/Applications
@@ -19,6 +19,7 @@ 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
@@ -106,6 +107,7 @@ Ten pakiet dodaje do gdm wsparcie dla Xnest.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 rm -f missing