Mercurial > hg > fedora
changeset 49:32c44002d507
* Mon Aug 27 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.14.b18.snapshot
- Add documentation for plugin and src subpackages.
- Fix plugin alternative on x86_64.
- Add java-1.7.0-icedtea-win32.patch.
- Rename modzip.sh generate-fedora-zip.sh.
- Keep patches in main directory.
- Namespace patches.
- Add java-1.7.0-icedtea-win32.patch, README.plugin and README.src.
- Bump release number.
| author | Thomas Fitzsimmons <fitzsim@redhat.com> |
|---|---|
| date | Mon, 27 Aug 2007 19:47:37 -0400 |
| parents | 98260aed6ff2 |
| children | e66c66e0a63f |
| files | README.plugin README.src generate-fedora-zip.sh java-1.7.0-icedtea-jhat.patch java-1.7.0-icedtea-makefile.patch java-1.7.0-icedtea-win32.patch java-1.7.0-icedtea.spec modzip.sh patches/Makefile.patch patches/jhat.patch |
| diffstat | 10 files changed, 388 insertions(+), 117 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.plugin Mon Aug 27 19:47:37 2007 -0400 @@ -0,0 +1,5 @@ +The java-1.7.0-icedtea-plugin subpackage contains a version of +gcjwebplugin that has been modified to run on the IcedTea class +libraries. The package manages an alternatives symlink, +/usr/lib/mozilla/plugins/libjavaplugin.so, so that gcjwebplugin is +recognized by the Firefox web browser.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/README.src Mon Aug 27 19:47:37 2007 -0400 @@ -0,0 +1,2 @@ +The java-1.7.0-icedtea-src subpackage contains the complete IcedTea +class library source code for use by IDE indexers and debuggers.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/generate-fedora-zip.sh Mon Aug 27 19:47:37 2007 -0400 @@ -0,0 +1,74 @@ +#!/bin/sh + +# Unzip openjdk source zip. +unzip -q $1 + +# Remove win32 sources, some of which have questionable license +# headers. +rm -rf \ + openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/win32 \ + openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/debugger/windbg \ + openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_amd64 \ + openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_ia64 \ + openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/win32_x86 + +# Remove idl sources with questionable license headers. +rm -f \ + openjdk/j2se/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl \ + openjdk/j2se/src/share/classes/com/sun/tools/corba/se/idl/first.set \ + openjdk/j2se/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl \ + openjdk/j2se/src/share/classes/com/sun/tools/corba/se/idl/follow.set + +# Remove test sources with questionable license headers. +rm -f \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Resource3.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Resource3_en_IE.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4165815Test.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4177489_Resource_jf.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Resource3_en_CA.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Getter.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4177489Test.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Resource.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Resource2.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Resource3_en_US.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4083270Test.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Resource3_en.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4177489_Resource.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Test.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Resource2_en_US.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4168625Class.java \ + openjdk/j2se/test/java/util/Locale/Bug4175998Test.java \ + openjdk/j2se/test/java/util/ResourceBundle/RBTestFmwk.java \ + openjdk/j2se/test/java/util/ResourceBundle/TestResource_fr.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4179766Resource.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4179766Getter.java \ + openjdk/j2se/test/java/util/ResourceBundle/Bug4179766Class.java \ + openjdk/j2se/test/java/util/ResourceBundle/TestResource.java \ + openjdk/j2se/test/java/util/ResourceBundle/FakeTestResource.java \ + openjdk/j2se/test/java/util/ResourceBundle/TestResource_de.java \ + openjdk/j2se/test/java/util/ResourceBundle/TestBug4179766.java \ + openjdk/j2se/test/java/util/ResourceBundle/TestResource_fr_CH.java \ + openjdk/j2se/test/java/util/ResourceBundle/ResourceBundleTest.java \ + openjdk/j2se/test/java/util/ResourceBundle/TestResource_it.java \ + openjdk/j2se/test/java/util/Locale/PrintDefaultLocale.java \ + openjdk/j2se/test/java/util/Locale/LocaleTest.java \ + openjdk/j2se/test/java/util/Locale/LocaleTestFmwk.java \ + openjdk/j2se/test/java/util/Locale/Bug4184873Test.java \ + openjdk/j2se/test/sun/text/resources/LocaleDataTest.java + +# Remove jhat sources. Most have questionable license headers. +rm -rf \ + openjdk/j2se/src/share/classes/com/sun/tools/hat \ + openjdk/j2se/make/sun/jhat/Makefile + +# Remove J2DBench sources, some of which have questionable license +# headers. +rm -rf \ + openjdk/j2se/src/share/demo/java2d/J2DBench + +# Create new zip with new name. +NEW_ZIP=$(echo $1 | sed -e 's/\.zip/-fedora.zip/') +zip -rq $NEW_ZIP openjdk + +# Remove old unzipped openjdk dir. +rm -rf openjdk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java-1.7.0-icedtea-jhat.patch Mon Aug 27 19:47:37 2007 -0400 @@ -0,0 +1,39 @@ +--- ../icedtea/openjdk-ecj/j2se/make/sun/Makefile 2007-08-24 12:47:38.000000000 -0400 ++++ openjdk/j2se/make/sun/Makefile 2007-08-27 14:42:08.000000000 -0400 +@@ -40,7 +40,7 @@ + ifndef J2RE_ONLY + TOOLS_SUBDIRS = javap native2ascii serialver jps jstat jstatd + TOOLS_SUBDIRS += $(JSADEBUGD_SUBDIR) +- TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript jhat ++ TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript + endif + + # Rhino/Mozilla java sources +--- ../icedtea/openjdk/j2se/make/common/Release.gmk 2007-08-16 03:17:47.000000000 -0400 ++++ openjdk/j2se/make/common/Release.gmk 2007-08-27 14:51:39.000000000 -0400 +@@ -169,7 +169,6 @@ + javap.1 \ + jconsole.1 \ + jdb.1 \ +- jhat.1 \ + jinfo.1 \ + jmap.1 \ + jps.1 \ +@@ -352,7 +351,6 @@ + com/sun/tools/example/debug/expr \ + com/sun/tools/example/debug/tty \ + com/sun/tools/extcheck \ +- com/sun/tools/hat \ + com/sun/tools/javac \ + com/sun/tools/javadoc \ + com/sun/tools/apt \ +@@ -462,8 +460,7 @@ + wsgen$(EXE_SUFFIX) \ + wsimport$(EXE_SUFFIX) \ + schemagen$(EXE_SUFFIX) \ +- jsadebugd$(EXE_SUFFIX) \ +- jhat$(EXE_SUFFIX) ++ jsadebugd$(EXE_SUFFIX) + + # The following get removed from the JRE after the bulk-copy of LIBDIR... + NOTJRELIBS = tools.jar \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java-1.7.0-icedtea-makefile.patch Mon Aug 27 19:47:37 2007 -0400 @@ -0,0 +1,36 @@ +--- Makefile.am.orig 2007-08-27 14:14:11.000000000 -0400 ++++ Makefile.am 2007-08-27 14:14:27.000000000 -0400 +@@ -122,15 +122,6 @@ + + download.stamp: + rm -f download.stamp +- if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ +- | $(MD5SUM) --check ; \ +- then \ +- if [ $(OPENJDK_SRC_ZIP) ] ; \ +- then \ +- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ +- fi ; \ +- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \ +- fi + touch download.stamp + + clean-download: +--- Makefile.in.orig 2007-08-27 14:14:16.000000000 -0400 ++++ Makefile.in 2007-08-27 14:14:34.000000000 -0400 +@@ -643,15 +643,6 @@ + + download.stamp: + rm -f download.stamp +- if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ +- | $(MD5SUM) --check ; \ +- then \ +- if [ $(OPENJDK_SRC_ZIP) ] ; \ +- then \ +- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ +- fi ; \ +- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \ +- fi + touch download.stamp + + clean-download:
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/java-1.7.0-icedtea-win32.patch Mon Aug 27 19:47:37 2007 -0400 @@ -0,0 +1,191 @@ +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java.orig 2007-08-27 16:27:50.000000000 -0400 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/HotSpotAgent.java 2007-08-27 16:28:43.000000000 -0400 +@@ -31,8 +31,6 @@ + import sun.jvm.hotspot.debugger.dbx.*; + import sun.jvm.hotspot.debugger.proc.*; + import sun.jvm.hotspot.debugger.remote.*; +-import sun.jvm.hotspot.debugger.win32.*; +-import sun.jvm.hotspot.debugger.windbg.*; + import sun.jvm.hotspot.debugger.linux.*; + import sun.jvm.hotspot.memory.*; + import sun.jvm.hotspot.oops.*; +@@ -333,8 +331,6 @@ + + if (os.equals("solaris")) { + setupDebuggerSolaris(); +- } else if (os.equals("win32")) { +- setupDebuggerWin32(); + } else if (os.equals("linux")) { + setupDebuggerLinux(); + } else { +@@ -384,10 +380,6 @@ + db = new HotSpotTypeDataBase(machDesc, + new HotSpotSolarisVtblAccess(debugger, jvmLibNames), + debugger, jvmLibNames); +- } else if (os.equals("win32")) { +- db = new HotSpotTypeDataBase(machDesc, +- new Win32VtblAccess(debugger, jvmLibNames), +- debugger, jvmLibNames); + } else if (os.equals("linux")) { + db = new HotSpotTypeDataBase(machDesc, + new LinuxVtblAccess(debugger, jvmLibNames), +@@ -553,8 +545,6 @@ + os = debugger.getOS(); + if (os.equals("solaris")) { + setupJVMLibNamesSolaris(); +- } else if (os.equals("win32")) { +- setupJVMLibNamesWin32(); + } else if (os.equals("linux")) { + setupJVMLibNamesLinux(); + } else { +@@ -569,42 +559,6 @@ + } + + // +- // Win32 +- // +- +- private void setupDebuggerWin32() { +- setupJVMLibNamesWin32(); +- +- if (cpu.equals("x86")) { +- machDesc = new MachineDescriptionIntelX86(); +- } else if (cpu.equals("amd64")) { +- machDesc = new MachineDescriptionAMD64(); +- } else if (cpu.equals("ia64")) { +- machDesc = new MachineDescriptionIA64(); +- } else { +- throw new DebuggerException("Win32 supported under x86, amd64 and ia64 only"); +- } +- +- // Note we do not use a cache for the local debugger in server +- // mode; it will be taken care of on the client side (once remote +- // debugging is implemented). +- +- if (System.getProperty("sun.jvm.hotspot.debugger.useWindbgDebugger") != null) { +- debugger = new WindbgDebuggerLocal(machDesc, !isServer); +- } else { +- debugger = new Win32DebuggerLocal(machDesc, !isServer); +- } +- +- attachDebugger(); +- +- // FIXME: add support for server mode +- } +- +- private void setupJVMLibNamesWin32() { +- jvmLibNames = new String[] { "jvm.dll", "jvm_g.dll" }; +- } +- +- // + // Linux + // + +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java.orig 2007-08-27 16:30:06.000000000 -0400 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/bugspot/BugSpotAgent.java 2007-08-27 16:30:58.000000000 -0400 +@@ -32,8 +32,6 @@ + import sun.jvm.hotspot.debugger.dbx.*; + import sun.jvm.hotspot.debugger.proc.*; + import sun.jvm.hotspot.debugger.cdbg.*; +-import sun.jvm.hotspot.debugger.win32.*; +-import sun.jvm.hotspot.debugger.windbg.*; + import sun.jvm.hotspot.debugger.linux.*; + import sun.jvm.hotspot.debugger.sparc.*; + import sun.jvm.hotspot.debugger.remote.*; +@@ -512,8 +510,6 @@ + + if (os.equals("solaris")) { + setupDebuggerSolaris(); +- } else if (os.equals("win32")) { +- setupDebuggerWin32(); + } else if (os.equals("linux")) { + setupDebuggerLinux(); + } else { +@@ -561,9 +557,6 @@ + if (os.equals("solaris")) { + db = new HotSpotTypeDataBase(machDesc, new HotSpotSolarisVtblAccess(debugger, jvmLibNames), + debugger, jvmLibNames); +- } else if (os.equals("win32")) { +- db = new HotSpotTypeDataBase(machDesc, new Win32VtblAccess(debugger, jvmLibNames), +- debugger, jvmLibNames); + } else if (os.equals("linux")) { + db = new HotSpotTypeDataBase(machDesc, new LinuxVtblAccess(debugger, jvmLibNames), + debugger, jvmLibNames); +@@ -735,8 +728,6 @@ + os = debugger.getOS(); + if (os.equals("solaris")) { + setupJVMLibNamesSolaris(); +- } else if (os.equals("win32")) { +- setupJVMLibNamesWin32(); + } else if (os.equals("linux")) { + setupJVMLibNamesLinux(); + } else { +@@ -752,41 +743,6 @@ + } + + // +- // Win32 +- // +- +- private void setupDebuggerWin32() { +- setupJVMLibNamesWin32(); +- +- if (cpu.equals("x86")) { +- machDesc = new MachineDescriptionIntelX86(); +- } else if (cpu.equals("amd64")) { +- machDesc = new MachineDescriptionAMD64(); +- } else if (cpu.equals("ia64")) { +- machDesc = new MachineDescriptionIA64(); +- } else { +- throw new DebuggerException("Win32 supported under x86, amd64 and ia64 only"); +- } +- +- // Note we do not use a cache for the local debugger in server +- // mode; it will be taken care of on the client side (once remote +- // debugging is implemented). +- +- if (System.getProperty("sun.jvm.hotspot.debugger.useWindbgDebugger") != null) { +- debugger = new WindbgDebuggerLocal(machDesc, !isServer); +- } else { +- debugger = new Win32DebuggerLocal(machDesc, !isServer); +- } +- +- attachDebugger(); +- } +- +- private void setupJVMLibNamesWin32() { +- jvmLibNames = new String[] { "jvm.dll", "jvm_g.dll" }; +- saLibNames = new String[] { "sa.dll", "sa_g.dll" }; +- } +- +- // + // Linux + // + +--- openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java.orig 2007-08-27 16:33:03.000000000 -0400 ++++ openjdk/hotspot/agent/src/share/classes/sun/jvm/hotspot/runtime/Threads.java 2007-08-27 16:33:28.000000000 -0400 +@@ -30,9 +30,6 @@ + import sun.jvm.hotspot.runtime.solaris_sparc.SolarisSPARCJavaThreadPDAccess; + import sun.jvm.hotspot.runtime.solaris_x86.SolarisX86JavaThreadPDAccess; + import sun.jvm.hotspot.runtime.solaris_amd64.SolarisAMD64JavaThreadPDAccess; +-import sun.jvm.hotspot.runtime.win32_amd64.Win32AMD64JavaThreadPDAccess; +-import sun.jvm.hotspot.runtime.win32_x86.Win32X86JavaThreadPDAccess; +-import sun.jvm.hotspot.runtime.win32_ia64.Win32IA64JavaThreadPDAccess; + import sun.jvm.hotspot.runtime.linux_x86.LinuxX86JavaThreadPDAccess; + import sun.jvm.hotspot.runtime.linux_ia64.LinuxIA64JavaThreadPDAccess; + import sun.jvm.hotspot.runtime.linux_amd64.LinuxAMD64JavaThreadPDAccess; +@@ -72,14 +69,6 @@ + } else if (cpu.equals("amd64")) { + access = new SolarisAMD64JavaThreadPDAccess(); + } +- } else if (os.equals("win32")) { +- if (cpu.equals("x86")) { +- access = new Win32X86JavaThreadPDAccess(); +- } else if (cpu.equals("amd64")) { +- access = new Win32AMD64JavaThreadPDAccess(); +- } else if (cpu.equals("ia64")) { +- access = new Win32IA64JavaThreadPDAccess(); +- } + } else if (os.equals("linux")) { + if (cpu.equals("x86")) { + access = new LinuxX86JavaThreadPDAccess();
--- a/java-1.7.0-icedtea.spec Mon Aug 27 15:40:47 2007 -0400 +++ b/java-1.7.0-icedtea.spec Mon Aug 27 19:47:37 2007 -0400 @@ -5,7 +5,7 @@ %define gcjbootstrap 1 %define icedteaver 1.3 -%define icedteasnapshot -0ff3dc1b992a62822f246feac067ba5433cca1b7 +%define icedteasnapshot -a9c9ee1b6479a84f2153be67fce85b0dbf371398 %define icedtearelease snapshot %define openjdkver b18 %define openjdkdate 16_aug_2007 @@ -20,7 +20,7 @@ %define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/ %define openjdkurl %{openjdkurlbase}%{openjdkver}/ %define openjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}.zip -%define newopenjdkzip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip +%define fedorazip openjdk-7-ea-src-%{openjdkver}-%{openjdkdate}-fedora.zip %ifarch x86_64 %define archbuild amd64 @@ -52,11 +52,13 @@ %define archname %{name}.%{_arch} %define localpolicy jce_%{javaver}_%{origin}_local_policy.%{_arch} %define uspolicy jce_%{javaver}_%{origin}_us_export_policy.%{_arch} +%define javaplugin libjavaplugin.so.%{_arch} %else %define syslibdir %{_libdir} %define archname %{name} %define localpolicy jce_%{javaver}_%{origin}_local_policy %define uspolicy jce_%{javaver}_%{origin}_us_export_policy +%define javaplugin libjavaplugin.so %endif # Standard JPackage naming and versioning defines. @@ -92,21 +94,26 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{buildver} -Release: 0.13.%{openjdkver}.%{icedtearelease}%{?dist} +Release: 0.14.%{openjdkver}.%{icedtearelease}%{?dist} Summary: IcedTea Runtime Environment Group: Development/Languages License: GPLv2 with exceptions URL: http://icedtea.classpath.org/ Source0: %{url}download/source/icedtea-%{icedteaver}%{icedteasnapshot}.tar.gz -Source1: %{openjdkurl}%{openjdkzip} +# To generate the fedorazip, run generate-fedora-zip.sh on openjdkzip. +# Source1: %{openjdkurl}%{openjdkzip} +Source1: %{fedorazip} # Save icedtea.classpath.org space and bandwidth. NoSource: 1 Source2: %{accessurl}%{accessmajorver}/java-access-bridge-%{accessver}.tar.gz Source3: %{genurl}generate-cacerts.pl -Source4: %{genurl}modzip.sh -Source5: %{newopenjdkzip} -Source6: %{genurl}patches +Source4: %{genurl}generate-fedora-zip.sh +Source5: README.src +Source6: README.plugin +Patch0: java-1.7.0-icedtea-makefile.patch +Patch1: java-1.7.0-icedtea-jhat.patch +Patch2: java-1.7.0-icedtea-win32.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -238,7 +245,7 @@ Group: Applications/Internet Requires: %{name} = %{version}-%{release} -Requires: %{_libdir}/mozilla/plugins +Requires: %{syslibdir}/mozilla/plugins # Post requires alternatives to install plugin alternative. Requires(post): %{_sbindir}/alternatives # Postun requires alternatives to uninstall plugin alternative. @@ -253,17 +260,20 @@ %prep %setup -q -n icedtea-%{icedteaver} -gzip -dc %{SOURCE2} | tar -xf - -# modzip script removes all jhat and idlj source files that have -# questionable license headers. The openjdk sources are re-zipped -# with a new name (see newopenjdkzip) and used to build IcedTea. -%{SOURCE4} %{SOURCE1} +%setup -q -n icedtea-%{icedteaver} -T -D -a 2 +%patch0 +cp %{SOURCE5} . +cp %{SOURCE6} . %build -# We don't want to download the zip from OpenJDK. Therefore, we -# needed to patch out md5sum check from Makefile in IcedTea. -patch -p1 < %{SOURCE6}/Makefile.patch -./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE5} +./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} +make patch-ecj.stamp patch.stamp +pushd openjdk-ecj + patch -p1 < %{PATCH1} + patch -p1 < %{PATCH2} +popd +patch -p0 < %{PATCH1} +patch -p0 < %{PATCH2} make pushd java-access-bridge-%{accessver} export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image @@ -491,7 +501,6 @@ --slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \ --slave %{_bindir}/apt apt %{sdkbindir}/apt \ --slave %{_bindir}/extcheck extcheck %{sdkbindir}/extcheck \ - --slave %{_bindir}/idlj idlj %{sdkbindir}/idlj \ --slave %{_bindir}/jar jar %{sdkbindir}/jar \ --slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \ --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \ @@ -521,8 +530,6 @@ %{_mandir}/man1/apt-%{name}.1$ext \ --slave %{_mandir}/man1/extcheck.1$ext extcheck.1$ext \ %{_mandir}/man1/extcheck-%{name}.1$ext \ - --slave %{_mandir}/man1/idlj.1$ext idlj.1$ext \ - %{_mandir}/man1/idlj-%{name}.1$ext \ --slave %{_mandir}/man1/jar.1$ext jar.1$ext \ %{_mandir}/man1/jar-%{name}.1$ext \ --slave %{_mandir}/man1/jarsigner.1$ext jarsigner.1$ext \ @@ -604,13 +611,13 @@ %post plugin alternatives \ - --install %{_libdir}/mozilla/plugins/libjavaplugin.so libjavaplugin.so \ + --install %{syslibdir}/mozilla/plugins/libjavaplugin.so %{javaplugin} \ %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so %{priority} %postun plugin if [ $1 -eq 0 ] then - alternatives --remove libjavaplugin.so \ + alternatives --remove %{javaplugin} \ %{_jvmdir}/%{jrelnk}/lib/%{archinstall}/gcjwebplugin.so fi @@ -664,7 +671,6 @@ %{_mandir}/man1/appletviewer-%{name}.1* %{_mandir}/man1/apt-%{name}.1* %{_mandir}/man1/extcheck-%{name}.1* -%{_mandir}/man1/idlj-%{name}.1* %{_mandir}/man1/jar-%{name}.1* %{_mandir}/man1/jarsigner-%{name}.1* %{_mandir}/man1/javac-%{name}.1* @@ -695,6 +701,7 @@ %files src %defattr(-,root,root,-) +%doc README.src %{_jvmdir}/%{sdkdir}/src.zip %files javadoc @@ -703,9 +710,20 @@ %files plugin %defattr(-,root,root,-) +%doc README.plugin %{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so %changelog +* Mon Aug 27 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 1.7.0.0-0.14.b18.snapshot +- Add documentation for plugin and src subpackages. +- Fix plugin alternative on x86_64. +- Add java-1.7.0-icedtea-win32.patch. +- Rename modzip.sh generate-fedora-zip.sh. +- Keep patches in main directory. +- Namespace patches. +- Add java-1.7.0-icedtea-win32.patch, README.plugin and README.src. +- Bump release number. + * Mon Aug 27 2007 Lillian Angel <langel@redhat.com> - 1.7.0.0-0.13.b18.snapshot - Added line to run modzip.sh to remove specific files from the openjdk zip. - Defined new openjdk zip created by modzip.sh as newopenjdkzip.
--- a/modzip.sh Mon Aug 27 15:40:47 2007 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -#!/bin/sh - -# Unzip openjdk source zip -unzip -q $@ - -# Remove idl sources with questionable license headers -rm -f openjdk/j2se/src/share/classes/com/sun/tools/corba/se/idl/grammar.idl openjdk/j2se/src/share/classes/com/sun/tools/corba/se/idl/first.set openjdk/j2se/src/share/classes/com/sun/tools/corba/se/idl/grammar3.idl openjdk/j2se/src/share/classes/com/sun/tools/corba/se/idl/follow.set - -# Remove jhat sources. Most have questionable license headers -rm -rf openjdk/j2se/src/share/classes/com/sun/tools/hat/* openjdk/j2se/make/sun/jhat/Makefile -patch -p0 < `pwd`/../patches/jhat.patch - -# Create new zip with new name -NEW_ZIP=`echo $@ | sed -e 's/\.zip/-fedora.zip/'` -zip -rq $NEW_ZIP openjdk/ - -# Remove old unzipped openjdk dir -rm -rf openjdk/ -
--- a/patches/Makefile.patch Mon Aug 27 15:40:47 2007 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ ---- amorig 2007-08-27 14:14:11.000000000 -0400 -+++ icedtea-1.3/Makefile.am 2007-08-27 14:14:27.000000000 -0400 -@@ -122,15 +122,6 @@ - - download.stamp: - rm -f download.stamp -- if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ -- | $(MD5SUM) --check ; \ -- then \ -- if [ $(OPENJDK_SRC_ZIP) ] ; \ -- then \ -- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ -- fi ; \ -- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \ -- fi - touch download.stamp - - clean-download: ---- inorig 2007-08-27 14:14:16.000000000 -0400 -+++ icedtea-1.3/Makefile.in 2007-08-27 14:14:34.000000000 -0400 -@@ -643,15 +643,6 @@ - - download.stamp: - rm -f download.stamp -- if ! echo "$(OPENJDK_MD5SUM) $(OPENJDK_SRC_ZIP)" \ -- | $(MD5SUM) --check ; \ -- then \ -- if [ $(OPENJDK_SRC_ZIP) ] ; \ -- then \ -- mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \ -- fi ; \ -- $(WGET) $(OPENJDK_URL)$(OPENJDK_SRC_ZIP_BASE) -O $(OPENJDK_SRC_ZIP); \ -- fi - touch download.stamp - - clean-download:
--- a/patches/jhat.patch Mon Aug 27 15:40:47 2007 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ ---- ../icedtea/openjdk-ecj/j2se/make/sun/Makefile 2007-08-24 12:47:38.000000000 -0400 -+++ openjdk/j2se/make/sun/Makefile 2007-08-27 14:42:08.000000000 -0400 -@@ -40,7 +40,7 @@ - ifndef J2RE_ONLY - TOOLS_SUBDIRS = javap native2ascii serialver jps jstat jstatd - TOOLS_SUBDIRS += $(JSADEBUGD_SUBDIR) -- TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript jhat -+ TOOLS_SUBDIRS += jstack jmap jinfo jconsole jrunscript - endif - - # Rhino/Mozilla java sources ---- ../icedtea/openjdk/j2se/make/common/Release.gmk 2007-08-16 03:17:47.000000000 -0400 -+++ openjdk/j2se/make/common/Release.gmk 2007-08-27 14:51:39.000000000 -0400 -@@ -169,7 +169,6 @@ - javap.1 \ - jconsole.1 \ - jdb.1 \ -- jhat.1 \ - jinfo.1 \ - jmap.1 \ - jps.1 \ -@@ -352,7 +351,6 @@ - com/sun/tools/example/debug/expr \ - com/sun/tools/example/debug/tty \ - com/sun/tools/extcheck \ -- com/sun/tools/hat \ - com/sun/tools/javac \ - com/sun/tools/javadoc \ - com/sun/tools/apt \ -@@ -462,8 +460,7 @@ - wsgen$(EXE_SUFFIX) \ - wsimport$(EXE_SUFFIX) \ - schemagen$(EXE_SUFFIX) \ -- jsadebugd$(EXE_SUFFIX) \ -- jhat$(EXE_SUFFIX) -+ jsadebugd$(EXE_SUFFIX) - - # The following get removed from the JRE after the bulk-copy of LIBDIR... - NOTJRELIBS = tools.jar \