rpms/java-1.6.0-openjdk/devel .cvsignore, 1.55, 1.56 java-1.6.0-openjdk-sparc-fixes.patch, 1.1, 1.2 java-1.6.0-openjdk.spec, 1.118, 1.119 sources, 1.62, 1.63 icedtea-nsIProcess.patch, 1.1, NONE 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
Tue May 19 13:09:57 UTC 2009
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30898
Modified Files:
.cvsignore java-1.6.0-openjdk-sparc-fixes.patch
java-1.6.0-openjdk.spec sources
Removed Files:
icedtea-nsIProcess.patch java-1.6.0-openjdk-lcms.patch
java-1.6.0-openjdk-pulsejava.patch
java-1.6.0-openjdk-securitypatches.patch
Log Message:
* Tue May 19 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
- Changed icedteaver to 1.5-rc. Only release candidate.
* Tue May 19 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
- Removed java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk-securitypatches.patch
java-1.6.0-openjdk-pulsejava.patch.
- Updated visualvm source.
- 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/devel/.cvsignore,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- .cvsignore 25 Feb 2009 18:54:35 -0000 1.55
+++ .cvsignore 19 May 2009 13:09:25 -0000 1.56
@@ -1,8 +1,3 @@
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
-hotspot.tar.gz
-netbeans-profiler-visualvm_release65_mod.tar.gz
-visualvm-11-src.tar.gz
-icedtea6-1.4.1.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/devel/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 25 Feb 2009 21:19:04 -0000 1.1
+++ java-1.6.0-openjdk-sparc-fixes.patch 19 May 2009 13:09:26 -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/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -p -r1.118 -r1.119
--- java-1.6.0-openjdk.spec 6 May 2009 18:57:14 -0000 1.118
+++ java-1.6.0-openjdk.spec 19 May 2009 13:09:26 -0000 1.119
@@ -6,10 +6,10 @@
# If runtests is 0 test suites will not be run.
%define runtests 0
-%define icedteaver 1.4.1
+%define icedteaver 1.5-rc
%define icedteasnapshot %{nil}
-%define openjdkver b14
-%define openjdkdate 25_nov_2008
+%define openjdkver b16
+%define openjdkdate 24_apr_2009
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -19,7 +19,7 @@
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
-%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127067/
+%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/
%define netbeansurl http://icedtea.classpath.org/visualvm/
%define hotspoturl http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
@@ -62,7 +62,7 @@
%define runtests 0
%endif
-%define buildoutputdir openjdk/control/build/linux-%{archbuild}
+%define buildoutputdir openjdk/build/linux-%{archbuild}
%if %{gcjbootstrap}
%define icedteaopt %{nil}
@@ -115,12 +115,19 @@
%define jvmjardir %{_jvmjardir}/%{name}-%{version}
%endif
+# 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
+
# Prevent brp-java-repack-jars from being run.
%define __jar_repack 0
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 20.%{openjdkver}%{?dist}
+Release: 21.%{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
@@ -145,7 +152,7 @@ Source5: mauve-%{mauvedate}.tar.gz
Source6: mauve_tests
Source7: %{hotspoturl}/hotspot.tar.gz
Source8: %{netbeansurl}/netbeans-profiler-visualvm_release65_mod.tar.gz
-Source9: %{visualvmurl}/visualvm-11-src.tar.gz
+Source9: %{visualvmurl}/visualvm-111-src.tar.gz
# FIXME: This patch needs to be fixed. optflags argument
# -mtune=generic is being ignored because it breaks several graphical
# applications.
@@ -157,10 +164,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
-Patch20: icedtea-nsIProcess.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -219,6 +222,8 @@ BuildRequires: pulseaudio >= 0.9.11
%ifnarch %{jit_arches}
BuildRequires: libffi-devel
%endif
+#systemtap build requirement.
+BuildRequires: systemtap-sdt-devel
# visualvm build requirements.
BuildRequires: netbeans
BuildRequires: jakarta-commons-logging
@@ -374,8 +379,6 @@ The OpenJDK web browser plugin.
%patch0
%patch2
%patch6 -p1
-%patch9
-%patch20 -p1 -b .nsIProcess
cp %{SOURCE4} .
cp %{SOURCE6} .
cp %{SOURCE7} .
@@ -393,7 +396,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 --enable-visualvm
+ --enable-visualvm --with-hotspot-src-zip=%{SOURCE7} --enable-systemtap \
+ --with-abs-install-dir=$RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
%endif
@@ -401,8 +405,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
@@ -464,6 +466,14 @@ pushd %{buildoutputdir}/j2sdk-image
install -d -m 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
cp -a jre/bin jre/lib $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}
+ # 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
+
%if 0%{?fedora} > 9
# Install cacerts symlink.
rm -f $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security/cacerts
@@ -872,9 +882,11 @@ exit 0
%dir %{_jvmdir}/%{sdkdir}/bin
%dir %{_jvmdir}/%{sdkdir}/include
%dir %{_jvmdir}/%{sdkdir}/lib
+%dir %{_jvmdir}/%{sdkdir}/tapset
%{_jvmdir}/%{sdkdir}/bin/*
%{_jvmdir}/%{sdkdir}/include/*
%{_jvmdir}/%{sdkdir}/lib/*
+%{_jvmdir}/%{sdkdir}/tapset/*.stp
%{_jvmdir}/%{sdklnk}
%{_jvmjardir}/%{sdklnk}
%{_datadir}/applications/*jconsole.desktop
@@ -907,6 +919,7 @@ exit 0
%{_mandir}/man1/wsimport-%{name}.1*
%{_mandir}/man1/xjc-%{name}.1*
%{_datadir}/applications/visualvm.desktop
+%{tapsetdir}/*.stp
%files demo -f %{name}-demo.files
%defattr(-,root,root,-)
@@ -931,6 +944,32 @@ exit 0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Tue May 19 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
+- Changed icedteaver to 1.5-rc. Only release candidate.
+
+* Tue May 19 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-21.b16
+- Removed java-1.6.0-openjdk-lcms.patch java-1.6.0-openjdk-securitypatches.patch
+java-1.6.0-openjdk-pulsejava.patch.
+- Updated visualvm source.
+- 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
+
* Wed May 6 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-20.b14
- Added devel requirement for netbeans-platform
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- sources 9 Mar 2009 13:07:51 -0000 1.62
+++ sources 19 May 2009 13:09:26 -0000 1.63
@@ -1,8 +1,3 @@
7a0c160c03012cd40957a7a112e25038 mauve_tests
1db4280d3228f20ad39ad22382ce2b00 java-access-bridge-1.23.0.tar.gz
a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
-bd07d61915e403a55a6ef42842b0cf8c openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
-c8f78d48ac83987bc2adebeebcd354e9 hotspot.tar.gz
-786ab31817cbd902a7211cd6a6161750 netbeans-profiler-visualvm_release65_mod.tar.gz
-1174486e82a65840b44c47166d79f212 visualvm-11-src.tar.gz
-a9559a8fb7b688ca2d78dd53db2ceef0 icedtea6-1.4.1.tar.gz
--- icedtea-nsIProcess.patch DELETED ---
--- 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 fedora-extras-commits
mailing list