rpms/java-1.6.0-openjdk/F-12 .cvsignore, 1.63, 1.64 java-1.6.0-openjdk.spec, 1.152, 1.153 sources, 1.70, 1.71
Martin Matejovic
mmatejov at fedoraproject.org
Wed May 12 14:41:37 UTC 2010
- Previous message: rpms/udev/devel .cvsignore,1.66,1.67 sources,1.66,1.67
- Next message: rpms/preupgrade/devel .cvsignore, 1.10, 1.11 preupgrade.spec, 1.23, 1.24 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mmatejov
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv8873
Modified Files:
.cvsignore java-1.6.0-openjdk.spec sources
Log Message:
* Tue Apr 20 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-38.b18
- Added icedtea6-1.8
- Added openjdk b18
- Added jdk6-jaf-%{jafdate}.zip as SOURCE9
- Added jdk6-jaxp-%{jaxpdate}.zip as SOURCE10
- Added jdk6-jaxws-%{jaxwsdate}.zip as SOURCE11
- Removed java-1.6.0-openjdk-securitypatches-20100323.patch
- Removed java-1.6.0-openjdk-linux-globals.patch
- Removed java-1.6.0-openjdk-memory-barriers.patch
- Removed java-1.6.0-openjdk-pulse-audio-libs.patch
- Enabled NPPlugin
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-12/.cvsignore,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- .cvsignore 2 Mar 2010 13:36:15 -0000 1.63
+++ .cvsignore 12 May 2010 14:41:37 -0000 1.64
@@ -2,6 +2,9 @@ mauve_tests
mauve-2008-10-22.tar.gz
netbeans-profiler-visualvm_release65_mod.tar.gz
visualvm-111-src.tar.gz
-openjdk-6-src-b17-14_oct_2009.tar.gz
java-access-bridge-1.23.0.tar.bz2
-icedtea6-1.7.1.tar.gz
+openjdk-6-src-b18-16_feb_2010-fedora.tar.gz
+icedtea6-1.8.tar.gz
+jdk6-jaf-2009_10_27.zip
+jdk6-jaxp-2009_10_13.zip
+jdk6-jaxws-2009_10_27.zip
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-12/java-1.6.0-openjdk.spec,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -p -r1.152 -r1.153
--- java-1.6.0-openjdk.spec 6 Apr 2010 07:38:03 -0000 1.152
+++ java-1.6.0-openjdk.spec 12 May 2010 14:41:37 -0000 1.153
@@ -6,10 +6,14 @@
# If runtests is 0 test suites will not be run.
%define runtests 1
-%define icedteaver 1.7.1
+%define icedteaver 1.8
%define icedteasnapshot %{nil}
-%define openjdkver b17
-%define openjdkdate 14_oct_2009
+%define openjdkver b18
+%define openjdkdate 16_feb_2010
+
+%define jaxpdate 2009_10_13
+%define jafdate 2009_10_27
+%define jaxwsdate 2009_10_27
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -18,13 +22,16 @@
%define accessver %{accessmajorver}.%{accessminorver}
%define accessurl http://ftp.gnome.org/pub/GNOME/sources/java-access-bridge/
+%define jaxpurl https://jaxp.dev.java.net/files/documents/913/147491/
+%define jafurl http://kenai.com/projects/jdk6-drops/downloads/download/
+%define jaxwsurl http://kenai.com/projects/jdk6-drops/downloads/download/
%define visualvmurl https://visualvm.dev.java.net/files/documents/7163/127170/
%define netbeansurl http://icedtea.classpath.org/visualvm/
%define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
%define openjdkurl %{openjdkurlbase}%{openjdkver}/
-%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz
+%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz
%define mauvedate 2008-10-22
@@ -136,7 +143,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 37.%{openjdkver}%{?dist}
+Release: 38.%{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
@@ -161,6 +168,10 @@ Source5: mauve-%{mauvedate}.tar.gz
Source6: mauve_tests
Source7: %{netbeansurl}/netbeans-profiler-visualvm_release65_mod.tar.gz
Source8: %{visualvmurl}/visualvm-111-src.tar.gz
+Source9: %{jafurl}jdk6-jaf-%{jafdate}.zip
+Source10: %{jaxpurl}jdk6-jaxp-%{jaxpdate}.zip
+Source11: %{jaxwsurl}jdk6-jaxws-%{jaxwsdate}.zip
+
# FIXME: This patch needs to be fixed. optflags argument
# -mtune=generic is being ignored because it breaks several graphical
# applications.
@@ -169,10 +180,6 @@ Patch1: java-1.6.0-openjdk-java-access
Patch2: java-1.6.0-openjdk-java-access-bridge-idlj.patch
Patch3: java-1.6.0-openjdk-java-access-bridge-security.patch
Patch4: java-1.6.0-openjdk-accessible-toolkit.patch
-Patch5: java-1.6.0-openjdk-linux-globals.patch
-Patch6: java-1.6.0-openjdk-memory-barriers.patch
-Patch7: java-1.6.0-openjdk-pulse-audio-libs.patch
-Patch8: java-1.6.0-openjdk-securitypatches-20100323.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -383,8 +390,6 @@ The OpenJDK web browser plugin.
%setup -q -n icedtea6-%{icedteaver} -T -D -a 5
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0
-%patch5
-%patch7
cp %{SOURCE4} .
cp %{SOURCE6} .
cp %{SOURCE7} .
@@ -401,15 +406,14 @@ export CFLAGS="$CFLAGS -mieee"
./autogen.sh
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
- --enable-visualvm --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
+ --enable-visualvm --with-jaf-drop-zip=%{SOURCE9} \
+ --with-jaxp-drop-zip=%{SOURCE10} --with-jaxws-drop-zip=%{SOURCE11} --with-abs-install-dir=%{_jvmdir}/%{sdkdir}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
%endif
make patch
patch -l -p0 < %{PATCH3}
patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH6}
-patch -l -p0 < %{PATCH8}
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -874,6 +878,7 @@ exit 0
%{_mandir}/man1/unpack200-%{name}.1*
%{_datadir}/pixmaps/javaws.png
%{_datadir}/applications/javaws.desktop
+%{_jvmdir}/%{jredir}/lib/security/nss.cfg
%files devel
%defattr(-,root,root,-)
@@ -955,6 +960,18 @@ exit 0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Tue Apr 20 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-38.b18
+- Added icedtea6-1.8
+- Added openjdk b18
+- Added jdk6-jaf-%{jafdate}.zip as SOURCE9
+- Added jdk6-jaxp-%{jaxpdate}.zip as SOURCE10
+- Added jdk6-jaxws-%{jaxwsdate}.zip as SOURCE11
+- Removed java-1.6.0-openjdk-securitypatches-20100323.patch
+- Removed java-1.6.0-openjdk-linux-globals.patch
+- Removed java-1.6.0-openjdk-memory-barriers.patch
+- Removed java-1.6.0-openjdk-pulse-audio-libs.patch
+- Enabled NPPlugin
+
* Tue Mar 30 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-37.b17
- Added java-1.6.0-openjdk-securitypatches-20100323.patch
- Resolves: rhbz#575760
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/F-12/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources 2 Mar 2010 13:36:15 -0000 1.70
+++ sources 12 May 2010 14:41:37 -0000 1.71
@@ -3,5 +3,8 @@ a9cdc5f050eb6e97c1b15ddd39978710 mauve-
a6756a62291ebea5c0e2431389b31380 netbeans-profiler-visualvm_release65_mod.tar.gz
a289739f4a5bcdb9a2c642cfcc1e83fe visualvm-111-src.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
-078fe0ab744c98694decc77f2456c560 openjdk-6-src-b17-14_oct_2009.tar.gz
-40fb37998d40ee2c9aad6087348c6306 icedtea6-1.7.1.tar.gz
+8605eab6f3b728939a0c689e51a2ba14 openjdk-6-src-b18-16_feb_2010-fedora.tar.gz
+e08dd0762749fb50ec6c273c366ee8ae icedtea6-1.8.tar.gz
+7a50bb540a27cdd0001885630088b758 jdk6-jaf-2009_10_27.zip
+a2f7b972124cd776ff71e7754eb9a429 jdk6-jaxp-2009_10_13.zip
+3ea5728706169498b722b898a1008acf jdk6-jaxws-2009_10_27.zip
- Previous message: rpms/udev/devel .cvsignore,1.66,1.67 sources,1.66,1.67
- Next message: rpms/preupgrade/devel .cvsignore, 1.10, 1.11 preupgrade.spec, 1.23, 1.24 sources, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list