rpms/java-1.6.0-openjdk/F-10 .cvsignore, 1.48, 1.49 java-1.6.0-openjdk-sparc-fixes.patch, 1.1, 1.2 java-1.6.0-openjdk.spec, 1.107, 1.108 sources, 1.54, 1.55 java-1.6.0-openjdk-lcms.patch, 1.4, NONE java-1.6.0-openjdk-pulsejava.patch, 1.1, NONE java-1.6.0-openjdk-securitypatches.patch, 1.1, NONE
Lillian Angel
langel at fedoraproject.org
Wed May 20 14:14:09 UTC 2009
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13027
Modified Files:
.cvsignore java-1.6.0-openjdk-sparc-fixes.patch
java-1.6.0-openjdk.spec sources
Removed Files:
java-1.6.0-openjdk-lcms.patch
java-1.6.0-openjdk-pulsejava.patch
java-1.6.0-openjdk-securitypatches.patch
Log Message:
* Wed May 20 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-16.b16
- Set icedteasnapshot. Only release candidate.
* Tue May 19 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-16.b16
- Removed java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk-securitypatches.patch
java-1.6.0-openjdk-pulsejava.patch.
- Updated sparc patches.
- Updated release.
- Updated icedteaver.
- Updated openjdkver.
- Updated openjdkdate.
- Adjusted buildoutputdir.
- Set runtests to 0. Hanging test causing problems.
- Include systemtap support, install hotspot tapset.
- Resolves: rhbz#479041
- Resolves: rhbz#480075
- Resolves: rhbz#483095
- Resolves: rhbz#487872
- Resolves: rhbz#467591
- Resolves: rhbz#487452
- Resolves: rhbz#498109
- Resolves: rhbz#497191
- Resolves: rhbz#462876
- Resolves: rhbz#489586
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- .cvsignore 22 Jan 2009 16:33:42 -0000 1.48
+++ .cvsignore 20 May 2009 14:13:38 -0000 1.49
@@ -1,6 +1,6 @@
mauve_tests
java-access-bridge-1.23.0.tar.gz
mauve-2008-10-22.tar.gz
-openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
-icedtea6-1.4.tar.gz
hotspot.tar.gz
+openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
+icedtea6-1.5-ea3bc7968a1cb39f1dab305ace06306b36f0f832.tar.gz
java-1.6.0-openjdk-sparc-fixes.patch:
Index: java-1.6.0-openjdk-sparc-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk-sparc-fixes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- java-1.6.0-openjdk-sparc-fixes.patch 12 Feb 2009 22:12:06 -0000 1.1
+++ java-1.6.0-openjdk-sparc-fixes.patch 20 May 2009 14:13:39 -0000 1.2
@@ -22,20 +22,9 @@ diff -Nur icedtea6-1.4-orig/Makefile.am
if WITH_RHINO
ICEDTEA_PATCHES += \
-diff -Nur icedtea6-1.4-orig/Makefile.in icedtea6-1.4/Makefile.in
---- icedtea6-1.4-orig/Makefile.in 2009-01-26 08:01:23.000000000 -0600
-+++ icedtea6-1.4/Makefile.in 2009-02-11 11:19:07.000000000 -0600
-@@ -589,7 +589,6 @@
- $(am__append_12) \
- patches/hotspot/$(HSBUILD)/icedtea-sparc64-linux.patch \
- patches/hotspot/$(HSBUILD)/icedtea-sparc-ptracefix.patch \
-- patches/hotspot/$(HSBUILD)/icedtea-sparc-trapsfix.patch \
- $(am__append_13) $(am__append_14) $(am__append_15) \
- $(am__append_16) $(DISTRIBUTION_PATCHES) \
- patches/icedtea-demo-swingapplet.patch \
-diff -Nur icedtea6-1.4-orig/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch icedtea6-1.4/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch
---- icedtea6-1.4-orig/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch 2008-12-15 11:16:15.000000000 -0600
-+++ icedtea6-1.4/patches/hotspot/14.0b08/icedtea-sparc-trapsfix.patch 1969-12-31 18:00:00.000000000 -0600
+diff -Nur icedtea6-1.4-orig/patches/hotspot/default/icedtea-sparc-trapsfix.patch icedtea6-1.4/patches/hotspot/default/icedtea-sparc-trapsfix.patch
+--- icedtea6-1.4-orig/patches/hotspot/default/icedtea-sparc-trapsfix.patch 2008-12-15 11:16:15.000000000 -0600
++++ icedtea6-1.4/patches/hotspot/default/icedtea-sparc-trapsfix.patch 1969-12-31 18:00:00.000000000 -0600
@@ -1,21 +0,0 @@
-diff -Nru openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp openjdk/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp
---- openjdk.orig/hotspot/src/os_cpu/linux_sparc/vm/assembler_linux_sparc.cpp 2008-08-04 08:40:18.000000000 +0100
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/java-1.6.0-openjdk.spec,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -p -r1.107 -r1.108
--- java-1.6.0-openjdk.spec 6 Apr 2009 14:07:35 -0000 1.107
+++ java-1.6.0-openjdk.spec 20 May 2009 14:13:39 -0000 1.108
@@ -6,10 +6,10 @@
# If runtests is 0 test suites will not be run.
%define runtests 1
-%define icedteaver 1.4
-%define icedteasnapshot %{nil}
-%define openjdkver b14
-%define openjdkdate 25_nov_2008
+%define icedteaver 1.5
+%define icedteasnapshot -ea3bc7968a1cb39f1dab305ace06306b36f0f832
+%define openjdkver b16
+%define openjdkdate 24_apr_2009
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -59,13 +59,17 @@
%define runtests 0
%endif
-%define buildoutputdir openjdk/control/build/linux-%{archbuild}
+%define buildoutputdir openjdk/build/linux-%{archbuild}
%if %{gcjbootstrap}
%define icedteaopt %{nil}
%else
+%ifarch %{jit_arches}
+%define icedteaopt --with-openjdk --enable-systemtap
+%else
%define icedteaopt --with-openjdk
%endif
+%endif
# Convert an absolute path to a relative path. Each symbolic link is
# specified relative to the directory in which it is installed so that
@@ -112,12 +116,21 @@
%define jvmjardir %{_jvmjardir}/%{name}-%{version}
%endif
+%ifarch %{jit_arches}
+# Where to install systemtap tapset (links)
+# We would like these to be in a package specific subdir,
+# but currently systemtap doesn't support that, so we have to
+# use the root tapset dir for now.
+#%define tapsetdir /usr/share/systemtap/tapset/%{sdkdir}
+%define tapsetdir /usr/share/systemtap/tapset
+%endif
+
# Prevent brp-java-repack-jars from being run.
%define __jar_repack 0
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 15.%{openjdkver}%{?dist}
+Release: 16.%{openjdkver}%{?dist}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
# also included the epoch in their virtual provides. This created a
@@ -152,9 +165,6 @@ Patch4: java-1.6.0-openjdk-java-access
Patch5: java-1.6.0-openjdk-accessible-toolkit.patch
Patch6: java-1.6.0-openjdk-sparc-fixes.patch
Patch7: java-1.6.0-openjdk-sparc-hotspot.patch
-Patch8: java-1.6.0-openjdk-lcms.patch
-Patch9: java-1.6.0-openjdk-securitypatches.patch
-Patch10: java-1.6.0-openjdk-pulsejava.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -213,6 +223,10 @@ BuildRequires: pulseaudio >= 0.9.11
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
%endif
+%ifarch %{jit_arches}
+#systemtap build requirement.
+BuildRequires: systemtap-sdt-devel
+%endif
Requires: rhino
Requires: libjpeg = 6b
@@ -363,7 +377,6 @@ The OpenJDK web browser plugin.
%patch0
%patch2
%patch6 -p1
-%patch9
cp %{SOURCE4} .
cp %{SOURCE6} .
cp %{SOURCE7} .
@@ -379,7 +392,8 @@ export CFLAGS="$CFLAGS -mieee"
./autogen.sh
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
- --with-hotspot-src-zip=hotspot.tar.gz
+ --with-hotspot-src-zip=%{SOURCE7} \
+ --with-abs-install-dir=$RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
%endif
@@ -387,8 +401,6 @@ make patch
patch -l -p0 < %{PATCH4}
patch -l -p0 < %{PATCH5}
patch -l -p0 < %{PATCH7}
-patch -l -p0 < %{PATCH8}
-patch -l -p0 < %{PATCH10}
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -450,6 +462,16 @@ pushd %{buildoutputdir}/j2sdk-image
install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
+%ifarch %{jit_arches}
+ # Install systemtap support files.
+ cp -a tapset $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
+ install -d -m 755 $RPM_BUILD_ROOT%{tapsetdir}
+ pushd $RPM_BUILD_ROOT%{tapsetdir}
+ RELATIVE=$(%{abs2rel} %{_jvmdir}/%{sdkdir}/tapset %{tapsetdir})
+ ln -sf $RELATIVE/*stp .
+ popd
+%endif
+
%if 0%{?fedora} > 9
# Install cacerts symlink.
rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/cacerts
@@ -855,9 +877,15 @@ exit 0
%dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
+%ifarch %{jit_arches}
+%dir %{_jvmdir}/%{sdkdir}/tapset
+%endif
%{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/*
+%ifarch %{jit_arches}
+%{_jvmdir}/%{sdkdir}/tapset/*.stp
+%endif
%{_jvmdir}/%{sdklnk}
%{_jvmjardir}/%{sdklnk}
%{_datadir}/applications/*jconsole.desktop
@@ -889,6 +917,9 @@ exit 0
%{_mandir}/man1/wsgen-%{name}.1*
%{_mandir}/man1/wsimport-%{name}.1*
%{_mandir}/man1/xjc-%{name}.1*
+%ifarch %{jit_arches}
+%{tapsetdir}/*.stp
+%endif
%files demo -f %{name}-demo.files
%defattr(-,root,root,-)
@@ -913,6 +944,31 @@ exit 0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Wed May 20 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-16.b16
+- Set icedteasnapshot. Only release candidate.
+
+* Tue May 19 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-16.b16
+- Removed java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk-securitypatches.patch
+java-1.6.0-openjdk-pulsejava.patch.
+- Updated sparc patches.
+- Updated release.
+- Updated icedteaver.
+- Updated openjdkver.
+- Updated openjdkdate.
+- Adjusted buildoutputdir.
+- Set runtests to 0. Hanging test causing problems.
+- Include systemtap support, install hotspot tapset.
+- Resolves: rhbz#479041
+- Resolves: rhbz#480075
+- Resolves: rhbz#483095
+- Resolves: rhbz#487872
+- Resolves: rhbz#467591
+- Resolves: rhbz#487452
+- Resolves: rhbz#498109
+- Resolves: rhbz#497191
+- Resolves: rhbz#462876
+- Resolves: rhbz#489586
+
* Mon Apr 6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-15.b14
- Updated java-1.6.0-openjdk-lcms.patch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-10/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources 28 Jan 2009 15:54:54 -0000 1.54
+++ sources 20 May 2009 14:13:39 -0000 1.55
@@ -1,6 +1,6 @@
7a0c160c03012cd40957a7a112e25038 mauve_tests
1db4280d3228f20ad39ad22382ce2b00 java-access-bridge-1.23.0.tar.gz
a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
-79d9511129158fa4fd3798a506757a5d openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
-c8f78d48ac83987bc2adebeebcd354e9 hotspot.tar.gz
-6428ca1b0c38111cca230f5b69460b03 icedtea6-1.4.tar.gz
+dbd7aca5544d1aeebf0eadd45d29d08e hotspot.tar.gz
+547db20e170c2a2566a56455b196aef7 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
+8303cf46a3be005068fa17cd73ee839e icedtea6-1.5-ea3bc7968a1cb39f1dab305ace06306b36f0f832.tar.gz
--- java-1.6.0-openjdk-lcms.patch DELETED ---
--- java-1.6.0-openjdk-pulsejava.patch DELETED ---
--- java-1.6.0-openjdk-securitypatches.patch DELETED ---
More information about the scm-commits
mailing list