rpms/java-1.6.0-openjdk/devel .cvsignore, 1.61, 1.62 Makefile, 1.2, 1.3 java-1.6.0-openjdk.spec, 1.137, 1.138 sources, 1.68, 1.69
Martin Matejovic
mmatejov at fedoraproject.org
Fri Jan 29 16:24:57 UTC 2010
Author: mmatejov
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28388
Modified Files:
.cvsignore Makefile java-1.6.0-openjdk.spec sources
Log Message:
* Fri Jan 29 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-34.b17
- Added icedtea6-1.7
- Added openjdk b17
- npplugin enabled
- Removed: java-1.6.0-openjdk-netbeans.patch
- Removed: java-1.6.0-openjdk-securitypatches-20091103.patch
- Removed: java-1.6.0-openjdk-sparc-fixes.patch
- Removed: java-1.6.0-openjdk-sparc-hotspot.patch
- Removed: java-1.6.0-openjdk-x11.patch
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- .cvsignore 10 Sep 2009 16:12:06 -0000 1.61
+++ .cvsignore 29 Jan 2010 16:24:56 -0000 1.62
@@ -6,3 +6,5 @@ visualvm-111-src.tar.gz
hotspot.tar.gz
java-access-bridge-1.23.0.tar.bz2
icedtea6-1.6.tar.gz
+icedtea6-1.7.tar.gz
+openjdk-6-src-b17-14_oct_2009.tar.gz
Index: Makefile
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- Makefile 25 Nov 2009 23:41:10 -0000 1.2
+++ Makefile 29 Jan 2010 16:24:57 -0000 1.3
@@ -4,7 +4,7 @@ NAME := java-1.6.0-openjdk
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
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.137
retrieving revision 1.138
diff -u -p -r1.137 -r1.138
--- java-1.6.0-openjdk.spec 10 Sep 2009 20:36:59 -0000 1.137
+++ java-1.6.0-openjdk.spec 29 Jan 2010 16:24:57 -0000 1.138
@@ -1,15 +1,15 @@
-# If gcjbootstrap is 1 IcedTea is bootstrapped against
+#nd If gcjbootstrap is 1 IcedTea is bootstrapped against
# java-1.5.0-gcj-devel. If gcjbootstrap is 0 IcedTea is built against
# java-1.6.0-openjdk-devel.
%define gcjbootstrap 0
# If runtests is 0 test suites will not be run.
-%define runtests 1
+%define runtests 0
-%define icedteaver 1.6
+%define icedteaver 1.7
%define icedteasnapshot %{nil}
-%define openjdkver b16
-%define openjdkdate 24_apr_2009
+%define openjdkver b17
+%define openjdkdate 14_oct_2009
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -23,9 +23,9 @@
%define netbeansurl http://icedtea.classpath.org/visualvm/
%define hotspoturl http://hg.openjdk.java.net/jdk7/hotspot/hotspot/archive/
-%define openjdkurlbase http://www.java.net/download/openjdk/jdk7/promoted/
+%define openjdkurlbase http://www.java.net/download/openjdk/jdk6/promoted/
%define openjdkurl %{openjdkurlbase}%{openjdkver}/
-%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}-fedora.tar.gz
+%define fedorazip openjdk-6-src-%{openjdkver}-%{openjdkdate}.tar.gz
%define mauvedate 2008-10-22
@@ -68,7 +68,7 @@
%define icedteaopt %{nil}
%else
%ifarch %{jit_arches}
-%define icedteaopt --with-openjdk --enable-systemtap
+%define icedteaopt --with-openjdk --enable-systemtap --enable-npplugin
%else
%define icedteaopt --with-openjdk
%endif
@@ -137,7 +137,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 31.%{openjdkver}%{?dist}
+Release: 34.%{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
@@ -160,9 +160,8 @@ Source3: %{genurl}generate-fedora-zip.s
Source4: README.src
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-111-src.tar.gz
+Source7: %{netbeansurl}/netbeans-profiler-visualvm_release65_mod.tar.gz
+Source8: %{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.
@@ -171,10 +170,9 @@ 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-sparc-fixes.patch
-Patch6: java-1.6.0-openjdk-sparc-hotspot.patch
-Patch7: java-1.6.0-openjdk-x11.patch
-Patch8: java-1.6.0-openjdk-netbeans.patch
+#Patch5: java-1.6.0-openjdk-gcc-flags.patch
+#Patch6: java-1.6.0-openjdk-debuginfo.patch
+#Patch7: java-1.6.0-openjdk-elf-debuginfo.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -182,11 +180,6 @@ BuildRequires: alsa-lib-devel
BuildRequires: cups-devel
BuildRequires: desktop-file-utils
BuildRequires: giflib-devel
-%if 0%{?fedora}
-BuildRequires: lesstif-devel
-%else
-BuildRequires: openmotif-devel
-%endif
BuildRequires: libX11-devel
BuildRequires: libXi-devel
BuildRequires: libXp-devel
@@ -390,13 +383,11 @@ The OpenJDK web browser plugin.
%setup -q -n icedtea6-%{icedteaver} -T -D -a 5
%setup -q -n icedtea6-%{icedteaver} -T -D -a 2
%patch0
-%patch8
-%patch5 -p1
+#%patch5
cp %{SOURCE4} .
cp %{SOURCE6} .
cp %{SOURCE7} .
cp %{SOURCE8} .
-cp %{SOURCE9} .
%build
# Build IcedTea and OpenJDK.
@@ -409,7 +400,7 @@ export CFLAGS="$CFLAGS -mieee"
./autogen.sh
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1} \
--with-pkgversion=fedora-%{release}-%{_arch} --enable-pulse-java \
- --enable-visualvm -with-hotspot-src-zip=%{SOURCE7} \
+ --enable-visualvm \
--with-abs-install-dir=%{_jvmdir}/%{sdkdir}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
@@ -417,8 +408,8 @@ make stamps/patch-ecj.stamp
make patch
patch -l -p0 < %{PATCH3}
patch -l -p0 < %{PATCH4}
-patch -l -p0 < %{PATCH6}
-patch -l -p0 < %{PATCH7}
+#patch -l -p0 < %{PATCH6}
+#patch -l -p0 < %{PATCH7}
make
export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -854,7 +845,7 @@ exit 0
%defattr(-,root,root,-)
%doc %{buildoutputdir}/j2sdk-image/jre/ASSEMBLY_EXCEPTION
%doc %{buildoutputdir}/j2sdk-image/jre/LICENSE
-%doc %{buildoutputdir}/j2sdk-image/jre/README.html
+#%doc %{buildoutputdir}/j2sdk-image/jre/README.html
%doc %{buildoutputdir}/j2sdk-image/jre/THIRD_PARTY_README
# FIXME: The TRADEMARK file should be in j2sdk-image.
%doc openjdk/TRADEMARK
@@ -889,7 +880,7 @@ exit 0
%defattr(-,root,root,-)
%doc %{buildoutputdir}/j2sdk-image/ASSEMBLY_EXCEPTION
%doc %{buildoutputdir}/j2sdk-image/LICENSE
-%doc %{buildoutputdir}/j2sdk-image/README.html
+#%doc %{buildoutputdir}/j2sdk-image/README.html
%doc %{buildoutputdir}/j2sdk-image/THIRD_PARTY_README
# FIXME: The TRADEMARK file should be in j2sdk-image.
%doc openjdk/TRADEMARK
@@ -966,6 +957,41 @@ exit 0
%{_jvmdir}/%{jredir}/lib/%{archinstall}/IcedTeaPlugin.so
%changelog
+* Fri Jan 29 2010 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-34.b17
+- Added icedtea6-1.7
+- Added openjdk b17
+- npplugin enabled
+- Removed: java-1.6.0-openjdk-netbeans.patch
+- Removed: java-1.6.0-openjdk-securitypatches-20091103.patch
+- Removed: java-1.6.0-openjdk-sparc-fixes.patch
+- Removed: java-1.6.0-openjdk-sparc-hotspot.patch
+- Removed: java-1.6.0-openjdk-x11.patch
+
+* Mon Dec 14 2009 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-33.b16
+- Added java-1.6.0-openjdk-elf-debuginfo.patch
+- Added java-1.6.0-openjdk-debuginfo.patch
+
+* Thu Nov 12 2009 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-33.b16
+- Updated release
+- Fixed applying patches
+
+* Mon Nov 09 2009 Martin Matejovic <mmatejov at redhat.com> - 1:1.6.0-32.b16
+- Added java-1.6.0-openjdk-securitypatches-20091103.patch
+- Removed BuildRequirement: openmotif-devel, lesstif-devel
+- Resolves: rhbz#510197
+- Resolves: rhbz#530053
+- Resolves: rhbz#530057
+- Resolves: rhbz#530061
+- Resolves: rhbz#530062
+- Resolves: rhbz#530063
+- Resolves: rhbz#530067
+- Resolves: rhbz#530098
+- Resolves: rhbz#530173
+- Resolves: rhbz#530175
+- Resolves: rhbz#530296
+- Resolves: rhbz#530297
+- Resolves: rhbz#530300
+
* Thu Sep 9 2009 Lillian Angel <langel at redhat.com> - 1:1.6.0-31.b16
- Added java-1.6.0-openjdk-netbeans.patch.
- Reenabled visualvm.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- sources 10 Sep 2009 16:12:08 -0000 1.68
+++ sources 29 Jan 2010 16:24:57 -0000 1.69
@@ -4,5 +4,5 @@ a6756a62291ebea5c0e2431389b31380 netbea
a289739f4a5bcdb9a2c642cfcc1e83fe visualvm-111-src.tar.gz
c12f124672a97c7491530fed2c0facdc java-access-bridge-1.23.0.tar.bz2
600284e870609a7531163bf2972c573b hotspot.tar.gz
-a18717b554f1788b08844bd63e262fd8 openjdk-6-src-b16-24_apr_2009-fedora.tar.gz
-de61179beb105dcd5cbfbdc0dea43b8b icedtea6-1.6.tar.gz
+56dce477d8363db4e20199990167ff06 icedtea6-1.7.tar.gz
+078fe0ab744c98694decc77f2456c560 openjdk-6-src-b17-14_oct_2009.tar.gz
More information about the scm-commits
mailing list