/hg/icedtea6: PR633: Don't install the redundant proprietary jav...

[andrew at icedtea.classpath.org]

changeset 3dc52504cbdd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=3dc52504cbdd
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Feb 22 10:58:37 2011 +0000

	PR633: Don't install the redundant proprietary javaws man page

	2011-02-22 Andrew John Hughes <ahughes at redhat.com>

	 PR633: IcedTea installs javaws manpages on x86 even
	with --disable-webstart
		* Makefile.am: Add new page.
		* NEWS: Updated.
		* fsg.sh: Remove useless javaws man pages.
		* patches/pr633-no_javaws_man_page.patch: Don't try and
	install javaws.1 on 32-bit platforms.


diffstat:

5 files changed, 33 insertions(+), 1 deletion(-)
ChangeLog                              |   10 ++++++++++
Makefile.am                            |    3 ++-
NEWS                                   |    1 +
fsg.sh                                 |    5 +++++
patches/pr633-no_javaws_man_page.patch |   15 +++++++++++++++

diffs (72 lines):

diff -r 4ffc2aade98c -r 3dc52504cbdd ChangeLog
--- a/ChangeLog	Tue Feb 22 08:34:09 2011 +0000
+++ b/ChangeLog	Tue Feb 22 10:58:37 2011 +0000
@@ -1,3 +1,13 @@ 2011-02-22  Andrew John Hughes  <ahughes
+2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR633: IcedTea installs javaws manpages on x86
+	even with --disable-webstart
+	* Makefile.am: Add new page.
+	* NEWS: Updated.
+	* fsg.sh: Remove useless javaws man pages.
+	* patches/pr633-no_javaws_man_page.patch:
+	Don't try and install javaws.1 on 32-bit platforms.
+
 2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
 
 	PR103: Usage of native2ascii during bootstrap.
diff -r 4ffc2aade98c -r 3dc52504cbdd Makefile.am
--- a/Makefile.am	Tue Feb 22 08:34:09 2011 +0000
+++ b/Makefile.am	Tue Feb 22 10:58:37 2011 +0000
@@ -307,7 +307,8 @@ ICEDTEA_PATCHES = \
 	patches/g344659-sparc_fix.patch \
 	patches/openjdk/6728834-blurred-lcd-aa-text.patch \
 	patches/openjdk/6749060-bad-lcd-aa-non-opaque-dest.patch \
-	patches/openjdk/6896068-sg2d.patch
+	patches/openjdk/6896068-sg2d.patch \
+	patches/pr633-no_javaws_man_page.patch
 
 if !WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
diff -r 4ffc2aade98c -r 3dc52504cbdd NEWS
--- a/NEWS	Tue Feb 22 08:34:09 2011 +0000
+++ b/NEWS	Tue Feb 22 10:58:37 2011 +0000
@@ -430,6 +430,7 @@ New in release 1.10 (2011-XX-XX):
   - PR616, PR99: Don't statically link libstdc++ or libgcc
   - PR632: patches/security/20110215/6878713.patch breaks shark zero build
   - PR103: Usage of native2ascii during bootstrap
+  - PR633: IcedTea installs javaws manpages on x86 even with --disable-webstart
 * Cleanup
   - Patches are no longer prefixed with 'icedtea-'.
   - All m4 macros are now prefixed with 'IT_' to denote their origin correctly.
diff -r 4ffc2aade98c -r 3dc52504cbdd fsg.sh
--- a/fsg.sh	Tue Feb 22 08:34:09 2011 +0000
+++ b/fsg.sh	Tue Feb 22 10:58:37 2011 +0000
@@ -84,3 +84,8 @@ rm -f \
 
 # END Debian/Ubuntu additions
 
+# Remove man page for proprietary javaws
+rm -f openjdk/jdk/src/linux/doc/man/javaws.1 \
+    openjdk/jdk/src/linux/doc/man/ja/javaws.1 \
+    openjdk/jdk/src/solaris/doc/sun/man/man1/javaws.1 \
+    openjdk/jdk/src/solaris/doc/sun/man/man1/ja/javaws.1
diff -r 4ffc2aade98c -r 3dc52504cbdd patches/pr633-no_javaws_man_page.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr633-no_javaws_man_page.patch	Tue Feb 22 10:58:37 2011 +0000
@@ -0,0 +1,15 @@
+diff -Nru openjdk.orig/jdk/make/common/Release.gmk openjdk/jdk/make/common/Release.gmk
+--- openjdk.orig/jdk/make/common/Release.gmk	2011-02-22 08:36:53.832333120 +0000
++++ openjdk/jdk/make/common/Release.gmk	2011-02-22 08:37:11.462960201 +0000
+@@ -145,9 +145,11 @@
+ 	tnameserv.1     \
+ 	unpack200.1
+ 
++ifndef OPENJDK
+ ifeq ($(ARCH_DATA_MODEL),32)
+   JRE_MAN_PAGES += javaws.1
+ endif
++endif
+ 
+ JDK_MAN_PAGES =            \
+ 	$(JRE_MAN_PAGES)   \