rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-java-access-bridge-security.patch, NONE, 1.1 .cvsignore, 1.50, 1.51 java-1.6.0-openjdk-makefile.patch, 1.11, 1.12 java-1.6.0-openjdk.spec, 1.96, 1.97 sources, 1.52, 1.53
Lillian Angel
langel at fedoraproject.org
Fri Dec 5 16:45:48 UTC 2008
- Previous message (by thread): rpms/gmp-ecm/devel gmp-ecm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/java-1.6.0-openjdk/devel .cvsignore, 1.51, 1.52 sources, 1.53, 1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15977
Modified Files:
.cvsignore java-1.6.0-openjdk-makefile.patch
java-1.6.0-openjdk.spec sources
Added Files:
java-1.6.0-openjdk-java-access-bridge-security.patch
Log Message:
* Fri Dec 5 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-8.b14
- Added hotspot source.
- Added --with-hotspot-src-zip build option.
- Set runtests to 1.
- Updated jtreg log.
- Added new patch to add GNOME to java.security.
- Updated icedteasnapshot.
- Updated openjdkver.
- Updated openjdkdate.
- Resolves: rhbz#474431
- Resolves: rhbz#474503
- Resolves: rhbz#472862
java-1.6.0-openjdk-java-access-bridge-security.patch:
--- NEW FILE java-1.6.0-openjdk-java-access-bridge-security.patch ---
--- jsorig 2008-12-05 11:43:39.000000000 -0500
+++ openjdk/jdk/src/share/lib/security/java.security 2008-12-05 11:43:45.000000000 -0500
@@ -127,7 +127,7 @@
# passed to checkPackageAccess unless the
# corresponding RuntimePermission ("accessClassInPackage."+package) has
# been granted.
-package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.
+package.access=sun.,com.sun.xml.internal.ws.,com.sun.xml.internal.bind.,org.GNOME.Accessibility,org.GNOME.Bonobo
#
# List of comma-separated packages that start with or equal this string
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 2 Dec 2008 13:42:48 -0000 1.50
+++ .cvsignore 5 Dec 2008 16:45:47 -0000 1.51
@@ -4,5 +4,5 @@
netbeans-6.1-200805300101-basic_cluster-src.zip
mauve-2008-10-22.tar.gz
visualvm-20081031-src.tar.gz
-openjdk-6-src-b13-05_nov_2008-fedora.tar.gz
-icedtea6-1.4-a599dbe81c3d3ddfc44b18a030b90db1b36d82fe.tar.gz
+openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
+hotspot.tar.gz
java-1.6.0-openjdk-makefile.patch:
Index: java-1.6.0-openjdk-makefile.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- java-1.6.0-openjdk-makefile.patch 22 Oct 2008 21:26:47 -0000 1.11
+++ java-1.6.0-openjdk-makefile.patch 5 Dec 2008 16:45:47 -0000 1.12
@@ -1,6 +1,6 @@
---- makefileam 2008-10-22 11:46:24.000000000 -0400
-+++ Makefile.am 2008-10-22 11:47:10.000000000 -0400
-@@ -350,46 +350,6 @@
+--- oldMakefile.am 2008-12-05 11:09:32.000000000 -0500
++++ Makefile.am 2008-12-05 11:10:34.000000000 -0500
+@@ -370,46 +370,6 @@
endif
endif
endif
@@ -47,15 +47,15 @@
mkdir -p stamps
touch stamps/download.stamp
-@@ -562,7 +522,6 @@
+@@ -629,7 +589,6 @@
mkdir openjdk ; \
$(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
chmod -R ug+w openjdk ; \
- sh $(abs_top_srcdir)/fsg.sh ; \
fi
- if WITH_CACAO
- if !USE_SYSTEM_CACAO
-@@ -607,7 +566,7 @@
+ if WITH_ALT_HSBUILD
+ if test -e ${HOTSPOT_SRC_ZIP} ; \
+@@ -683,7 +642,7 @@
clean-extract:
rm -f stamps/extract.stamp
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.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- java-1.6.0-openjdk.spec 3 Dec 2008 04:10:09 -0000 1.96
+++ java-1.6.0-openjdk.spec 5 Dec 2008 16:45:47 -0000 1.97
@@ -4,12 +4,12 @@
%define gcjbootstrap 0
# If runtests is 0 test suites will not be run.
-%define runtests 0
+%define runtests 1
%define icedteaver 1.4
-%define icedteasnapshot -a599dbe81c3d3ddfc44b18a030b90db1b36d82fe
-%define openjdkver b13
-%define openjdkdate 05_nov_2008
+%define icedteasnapshot -7801bbe25e3a2f4edecc7d510b28de1d485010f9
+%define openjdkver b14
+%define openjdkdate 25_nov_2008
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -20,6 +20,7 @@
%define visualvmurl http://icedtea.classpath.org/visualvm/
%define netbeansurl http://nbi.netbeans.org/files/documents/210/2056/
+%define hotspoturl http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
%define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
%define openjdkurl %{openjdkurlbase}%{openjdkver}/
@@ -108,7 +109,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 7.%{openjdkver}%{?dist}
+Release: 8.%{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
@@ -135,6 +136,7 @@
Source8: %{netbeansurl}/netbeans-6.1-200805300101-basic_cluster-src.zip
Source9: %{visualvmurl}/netbeans-profiler-visualvm_preview2.tar.gz
Source10: %{visualvmurl}/visualvm-20081031-src.tar.gz
+Source11: %{hotspoturl}/hotspot.tar.gz
# FIXME: This patch needs to be fixed. optflags argument
# -mtune=generic is being ignored because it breaks several graphical
# applications.
@@ -142,6 +144,7 @@
Patch1: java-1.6.0-openjdk-java-access-bridge-tck.patch
Patch2: java-1.6.0-openjdk-makefile.patch
Patch3: java-1.6.0-openjdk-java-access-bridge-idlj.patch
+Patch4: java-1.6.0-openjdk-java-access-bridge-security.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -360,17 +363,22 @@
cp %{SOURCE8} .
cp %{SOURCE9} .
cp %{SOURCE10} .
+cp %{SOURCE11} .
%build
# Build IcedTea and OpenJDK.
%ifarch sparc64
export ARCH_DATA_MODEL=64
%endif
+./autogen.sh
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} --enable-visualvm \
- --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java
+ --with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
+ --with-hotspot-src-zip=hotspot.tar.gz
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
%endif
+make patch
+patch -l -p0 < %{PATCH4}
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -395,7 +403,7 @@
export DISPLAY=:20
Xvfb :20 -screen 0 1x1x24 -ac&
echo $! > Xvfb.pid
- make jtregcheck -k | tee jtreg_output
+ make jtregcheck -k
kill -9 `cat Xvfb.pid`
unset DISPLAY
rm -f Xvfb.pid
@@ -887,7 +895,7 @@
# FIXME: put these in a separate testresults subpackage.
%doc mauve_tests
%doc mauve-%{mauvedate}/mauve_output
-%doc jtreg_output
+%doc test/jtreg-summary.log
%endif
%files javadoc
@@ -900,6 +908,19 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Fri Dec 5 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-8.b14
+- Added hotspot source.
+- Added --with-hotspot-src-zip build option.
+- Set runtests to 1.
+- Updated jtreg log.
+- Added new patch to add GNOME to java.security.
+- Updated icedteasnapshot.
+- Updated openjdkver.
+- Updated openjdkdate.
+- Resolves: rhbz#474431
+- Resolves: rhbz#474503
+- Resolves: rhbz#472862
+
* Tue Dec 2 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-7.b13
- Set runtests to 0.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- sources 2 Dec 2008 13:42:48 -0000 1.52
+++ sources 5 Dec 2008 16:45:47 -0000 1.53
@@ -4,5 +4,5 @@
a7ea855f475fa3a982f094a45c155ab4 netbeans-6.1-200805300101-basic_cluster-src.zip
a9cdc5f050eb6e97c1b15ddd39978710 mauve-2008-10-22.tar.gz
0bf855574d3977e80b7943e35fabaca9 visualvm-20081031-src.tar.gz
-138c72f5f5205db1d3b9c76fe3f65e17 openjdk-6-src-b13-05_nov_2008-fedora.tar.gz
-d62102f61a4c9f132a8ac556f168426b icedtea6-1.4-a599dbe81c3d3ddfc44b18a030b90db1b36d82fe.tar.gz
+bd07d61915e403a55a6ef42842b0cf8c openjdk-6-src-b14-25_nov_2008-fedora.tar.gz
+c8f78d48ac83987bc2adebeebcd354e9 hotspot.tar.gz
- Previous message (by thread): rpms/gmp-ecm/devel gmp-ecm.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Next message (by thread): rpms/java-1.6.0-openjdk/devel .cvsignore, 1.51, 1.52 sources, 1.53, 1.54
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list