* gnome-user-docs.spec: Disable patch 03 to fix 5072270. Removes quick start
user guide from build.
* patches/gnome-user-docs-02-sun-desktop-section.diff: Redo to remove qsug
references.
--- a/ChangeLog Fri Jul 09 16:37:29 2004 +0000
+++ b/ChangeLog Fri Jul 09 16:47:40 2004 +0000
@@ -12,6 +12,8 @@
* scrollkeeper.spec: Add patch 8.
* patches/gnome-user-docs-02-sun-desktop-section.diff: Update to
remove introduction-to-gnome from build. Fixes 5072269.
+ * gnome-user-docs.spec: Disable patch 03 so quick start user guide is
+ not installed. Fixes 5072270. Redo patch 2 to remove qsug refs.
2004-07-09 Dermot McCluskey <[email protected]>
--- a/gnome-user-docs.spec Fri Jul 09 16:37:29 2004 +0000
+++ b/gnome-user-docs.spec Fri Jul 09 16:47:40 2004 +0000
@@ -46,7 +46,7 @@
bzcat %SOURCE5 | tar xf -
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+# %patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
@@ -100,7 +100,11 @@
%{_datadir}/omf/*
%changelog
-* Wed Jul 08 2004 - [email protected]
+* Fri Jul 09 2004 - [email protected]
+- Disable patch 3 that adds sun-desktop (aka quick start user guide) Makefiles.
+ This fixes bug 5072270.
+
+* Wed Jul 07 2004 - [email protected]
- Add accessibility tarball and patch.
* Wed Jul 07 2004 - [email protected]
--- a/patches/gnome-user-docs-02-sun-desktop-section.diff Fri Jul 09 16:37:29 2004 +0000
+++ b/patches/gnome-user-docs-02-sun-desktop-section.diff Fri Jul 09 16:47:40 2004 +0000
@@ -1,19 +1,11 @@
--- gnome2-user-docs-2.5.0/Makefile.am.orig Sun Feb 2 20:03:29 2003
-+++ gnome2-user-docs-2.5.0/Makefile.am Fri Jul 9 17:15:18 2004
-@@ -2,6 +2,6 @@
++++ gnome2-user-docs-2.5.0/Makefile.am Fri Jul 9 17:26:21 2004
+@@ -1,7 +1,6 @@
+ SUBDIRS = \
gnome2-user-guide \
gnome2-accessibility-guide \
- gnome2-system-admin-guide \
+- gnome2-system-admin-guide \
- introduction-to-gnome
-+ sun-desktop
++ gnome2-system-admin-guide
EXTRA_DIST = gnome-user-docs.spec COPYING-DOCS xmldocs.make omf.make
---- ../gnome2-user-docs-2.5.0.old/configure.in 2004-02-19 17:25:31.000000000 +0000
-+++ ./configure.in 2004-02-19 17:35:32.000000000 +0000
-@@ -54,4 +54,6 @@
- gnome2-system-admin-guide/C/Makefile
- introduction-to-gnome/Makefile
- introduction-to-gnome/C/Makefile
-+sun-desktop/Makefile
-+sun-desktop/C/Makefile
- ])