rpms/java-1.6.0-openjdk/EL-5 java-1.6.0-openjdk-freetype.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 generate-fedora-zip.sh, 1.1, 1.2 java-1.6.0-openjdk-makefile.patch, 1.1, 1.2 java-1.6.0-openjdk-optflags.patch, 1.1, 1.2 java-1.6.0-openjdk.spec, 1.12, 1.13 sources, 1.9, 1.10 java-1.6.0-openjdk-trademark.patch, 1.1, NONE
Lubomir Kundrak (lkundrak)
fedora-extras-commits at redhat.com
Sun Apr 6 15:30:20 UTC 2008
Author: lkundrak
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2358/EL-5
Modified Files:
.cvsignore generate-fedora-zip.sh
java-1.6.0-openjdk-makefile.patch
java-1.6.0-openjdk-optflags.patch java-1.6.0-openjdk.spec
sources
Added Files:
java-1.6.0-openjdk-freetype.patch
Removed Files:
java-1.6.0-openjdk-trademark.patch
Log Message:
Importing OpenJDK to EPEL
java-1.6.0-openjdk-freetype.patch:
--- NEW FILE java-1.6.0-openjdk-freetype.patch ---
--- icedtea6-1.0.orig/openjdk/jdk/make/common/shared/Platform.gmk 2008-03-19 11:15:29.000000000 +0100
+++ icedtea6-1.0/openjdk/jdk/make/common/shared/Platform.gmk 2008-03-19 11:15:11.000000000 +0100
@@ -94,7 +94,7 @@
REQUIRED_BOOT_VER = 1.5
# If we are using freetype, this is the required version
-REQUIRED_FREETYPE_VERSION=2.3.0
+REQUIRED_FREETYPE_VERSION=2.2.0
#
# Prune out all known SCM (Source Code Management) directories
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 17 Mar 2008 17:41:46 -0000 1.10
+++ .cvsignore 6 Apr 2008 15:29:42 -0000 1.11
@@ -1,5 +1,5 @@
-openjdk-6-src-b06-28_feb_2008-fedora.tar.gz
-mauve_tests
java-access-bridge-1.22.0.tar.gz
mauve-2008-03-11.tar.gz
-icedtea6-1.0-d7f8439ac6dbb7b038f9af5827e055c9ca8fd2ec.tar.gz
+mauve_tests
+icedtea6-1.0-0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d.tar.gz
+openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
Index: generate-fedora-zip.sh
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/generate-fedora-zip.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- generate-fedora-zip.sh 10 Mar 2008 14:20:27 -0000 1.1
+++ generate-fedora-zip.sh 6 Apr 2008 15:29:42 -0000 1.2
@@ -4,8 +4,12 @@
mkdir openjdk
tar xf $1 -C openjdk
-# Patch trademark with proper trademark license.
-patch -p0 < java-1.6.0-openjdk-trademark.patch
+# Remove binaries
+rm -f \
+ openjdk/jdk/test/sun/management/windows/revokeall.exe \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/linux-i586/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-sparc/launcher \
+ openjdk/jdk/test/sun/management/jmxremote/bootstrap/solaris-i586/launcher
# Remove idl sources with questionable license headers.
rm -f \
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/EL-5/java-1.6.0-openjdk-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.6.0-openjdk-makefile.patch 10 Mar 2008 14:20:27 -0000 1.1
+++ java-1.6.0-openjdk-makefile.patch 6 Apr 2008 15:29:42 -0000 1.2
@@ -1,6 +1,6 @@
---- Makefile.am 2008-02-15 14:45:38.000000000 -0500
-+++ Makefile.am 2008-02-15 15:17:35.000000000 -0500
-@@ -149,15 +149,6 @@
+--- makeorig 2008-03-27 13:34:52.000000000 -0400
++++ Makefile.am 2008-03-27 13:35:11.000000000 -0400
+@@ -177,15 +177,6 @@
endif
stamps/download.stamp:
@@ -16,19 +16,19 @@
mkdir -p stamps
touch stamps/download.stamp
-@@ -228,8 +219,7 @@
+@@ -292,8 +283,7 @@
stamps/extract.stamp: stamps/download.stamp
if ! test -d openjdk ; \
then \
- mkdir openjdk ; \
-- $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
-+ $(TAR) xf $(OPENJDK_SRC_ZIP); \
+- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
++ $(TAR) xzf $(OPENJDK_SRC_ZIP); \
chmod -R ug+w openjdk ; \
fi
mkdir -p stamps
---- Makefile.in 2008-02-15 14:50:16.000000000 -0500
-+++ Makefile.in 2008-02-15 15:17:39.000000000 -0500
-@@ -715,15 +715,6 @@
+--- makeinorig 2008-03-27 13:34:58.000000000 -0400
++++ Makefile.in 2008-03-27 13:35:15.000000000 -0400
+@@ -755,15 +756,6 @@
mv $(DIST_ARCHIVES) $(distdir)-`hg tip --template '{node}'`.tar.gz
stamps/download.stamp:
@@ -44,13 +44,13 @@
mkdir -p stamps
touch stamps/download.stamp
-@@ -740,8 +731,7 @@
+@@ -792,8 +784,7 @@
stamps/extract.stamp: stamps/download.stamp
if ! test -d openjdk ; \
then \
- mkdir openjdk ; \
-- $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
-+ $(TAR) xf $(OPENJDK_SRC_ZIP); \
+- $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
++ $(TAR) xzf $(OPENJDK_SRC_ZIP); \
chmod -R ug+w openjdk ; \
fi
mkdir -p stamps
java-1.6.0-openjdk-optflags.patch:
Index: java-1.6.0-openjdk-optflags.patch
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- java-1.6.0-openjdk-optflags.patch 17 Mar 2008 17:41:46 -0000 1.1
+++ java-1.6.0-openjdk-optflags.patch 6 Apr 2008 15:29:42 -0000 1.2
@@ -1,120 +1,117 @@
-diff -r d7f8439ac6db Makefile.am
---- a/Makefile.am Mon Mar 17 08:48:42 2008 -0400
-+++ Makefile.am Mon Mar 17 12:36:28 2008 -0400
-@@ -95,6 +95,7 @@ ICEDTEA_ENV = \
+--- openjdkold/icedtea6/Makefile.am 2008-03-31 13:53:06.000000000 -0400
++++ Makefile.am 2008-04-01 08:43:45.000000000 -0400
+@@ -94,6 +94,7 @@
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
-+ "OPT_CFLAGS=$(OPT_CFLAGS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)"
-
-@@ -132,6 +133,7 @@ ICEDTEA_ENV_ECJ = \
- "LD_LIBRARY_PATH=" \
- "GENSRCDIR=$(abs_top_srcdir)/generated" \
- "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
-+ "OPT_CFLAGS=$(OPT_CFLAGS)" \
- "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
- "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
- "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
-@@ -262,6 +264,7 @@ ICEDTEA_PATCHES = \
- patches/icedtea-lib64.patch \
- patches/icedtea-zero-build.patch \
- patches/icedtea-print-lsb-release.patch \
-+ patches/icedtea-optflags.patch \
- $(GCC_PATCH) \
- $(FAST_BUILD_PATCH) \
- $(DISTRIBUTION_PATCHES)
-diff -r d7f8439ac6db Makefile.in
---- a/Makefile.in Mon Mar 17 08:48:42 2008 -0400
-+++ Makefile.in Mon Mar 17 12:36:28 2008 -0400
-@@ -125,6 +125,7 @@ MOZILLA_LIBS = @MOZILLA_LIBS@
- MOZILLA_LIBS = @MOZILLA_LIBS@
- OBJEXT = @OBJEXT@
- OPENJDK_SRC_DIR = @OPENJDK_SRC_DIR@
-+OPT_CFLAGS = @OPT_CFLAGS@
- PACKAGE = @PACKAGE@
- PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
- PACKAGE_NAME = @PACKAGE_NAME@
-@@ -280,6 +281,7 @@ ICEDTEA_ENV = \
+@@ -144,6 +145,7 @@
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
"LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
"LIBFFI_LIBS=$(LIBFFI_LIBS)" \
-+ "OPT_CFLAGS=$(OPT_CFLAGS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)"
-
-@@ -316,6 +318,7 @@ ICEDTEA_ENV_ECJ = \
- "LD_LIBRARY_PATH=" \
- "GENSRCDIR=$(abs_top_srcdir)/generated" \
- "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
-+ "OPT_CFLAGS=$(OPT_CFLAGS)" \
- "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
- "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
- "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
-@@ -396,6 +399,7 @@ ICEDTEA_PATCHES = \
- patches/icedtea-lib64.patch \
+@@ -278,6 +280,7 @@
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
+ patches/icedtea-jpegclasses.patch \
+ patches/icedtea-optflags.patch \
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
-diff -r d7f8439ac6db configure
---- a/configure Mon Mar 17 08:48:42 2008 -0400
-+++ configure Mon Mar 17 12:36:28 2008 -0400
-@@ -724,6 +724,7 @@ WITH_ICEDTEA_FALSE
+--- openjdkold/icedtea6/configure.ac 2008-03-31 09:47:41.000000000 -0400
++++ configure.ac 2008-04-01 08:41:47.000000000 -0400
+@@ -133,6 +133,9 @@
+ ])
+ AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
+
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++AC_SUBST(ALT_OPT_CFLAGS)
++
+ SET_ARCH_DIRS
+ if test "${with_openjdk}" == true
+ then
+--- openjdkold/icedtea6/Makefile.in 2008-03-31 13:53:10.000000000 -0400
++++ Makefile.in 2008-04-01 08:44:03.000000000 -0400
+@@ -73,6 +73,7 @@
+ ALSA_CFLAGS = @ALSA_CFLAGS@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
++ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
+ AMTAR = @AMTAR@
+ AUTOCONF = @AUTOCONF@
+ AUTOHEADER = @AUTOHEADER@
+@@ -287,6 +288,7 @@
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1)
+@@ -324,6 +326,7 @@
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
+@@ -384,7 +387,8 @@
+ patches/icedtea-generated.patch patches/icedtea-lib64.patch \
+ patches/icedtea-zero-build.patch \
+ patches/icedtea-print-lsb-release.patch \
+- patches/icedtea-jpegclasses.patch $(GCC_PATCH) \
++ patches/icedtea-jpegclasses.patch \
++ patches/icedtea-optflags.patch $(GCC_PATCH) \
+ $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
+
+ # Patch OpenJDK for plug replacements and ecj.
+--- openjdkold/icedtea6/configure 2008-03-31 12:15:40.000000000 -0400
++++ configure 2008-04-01 08:44:07.000000000 -0400
+@@ -726,6 +726,7 @@
WITH_ICEDTEA_FALSE
WITH_OPENJDK_TRUE
WITH_OPENJDK_FALSE
-+OPT_CFLAGS
++ALT_OPT_CFLAGS
BUILD_ARCH_DIR
INSTALL_ARCH_DIR
JAVA
-@@ -5367,6 +5368,9 @@ fi
+@@ -5591,6 +5592,9 @@
fi
-+OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
+
+
case "${host}" in
x86_64-*-*)
-@@ -12284,6 +12288,7 @@ WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$a
+@@ -12561,6 +12565,7 @@
WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$ac_delim
WITH_OPENJDK_TRUE!$WITH_OPENJDK_TRUE$ac_delim
WITH_OPENJDK_FALSE!$WITH_OPENJDK_FALSE$ac_delim
-+OPT_CFLAGS!$OPT_CFLAGS$ac_delim
++ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
JAVA!$JAVA$ac_delim
-@@ -12352,7 +12357,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
+@@ -12632,7 +12637,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 78; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 79; then
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 83; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 84; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-diff -r d7f8439ac6db configure.ac
---- a/configure.ac Mon Mar 17 08:48:42 2008 -0400
-+++ configure.ac Mon Mar 17 12:36:28 2008 -0400
-@@ -130,6 +130,9 @@ AC_ARG_WITH([openjdk],
- with_openjdk=false
- ])
- AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
-+
-+OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+AC_SUBST(OPT_CFLAGS)
-
- SET_ARCH_DIRS
- if test "${with_openjdk}" == true
-diff -r d7f8439ac6db patches/icedtea-optflags.patch
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ patches/icedtea-optflags.patch Mon Mar 17 12:36:28 2008 -0400
-@@ -0,0 +1,13 @@
+--- openjdkold/icedtea6/patches/icedtea-optflags.patch 1969-12-31 19:00:00.000000000 -0500
++++ patches/icedtea-optflags.patch 2008-04-01 08:41:47.000000000 -0400
+@@ -0,0 +1,59 @@
+--- oldopenjdk/hotspot/src/share/vm/libadt/port.hpp 2008-02-28 05:02:37.000000000 -0500
++++ openjdk/hotspot/src/share/vm/libadt/port.hpp 2008-03-14 16:21:10.000000000 -0400
+@@ -39,8 +39,8 @@
@@ -128,3 +125,49 @@
+ #undef bcmp
+ inline int bcmp(const void *s,const void *t,int len) { return memcmp(s,t,len);}
+ extern "C" unsigned long strtoul(const char *s, char **end, int base);
++--- oldopenjdk/hotspot/build/linux/makefiles/rules.make 2008-03-19 01:02:55.000000000 -0400
+++++ openjdk/hotspot/build/linux/makefiles/rules.make 2008-03-19 10:47:33.000000000 -0400
++@@ -37,8 +37,8 @@
++ DEMANGLE = $(DEMANGLER) < $@ > .$@ && mv -f .$@ $@
++
++ # $(CC) is the c compiler (cc/gcc), $(CCC) is the c++ compiler (CC/g++).
++-C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS)
++-CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS)
+++C_COMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) $(ALT_OPT_CFLAGS)
+++CC_COMPILE = $(CCC) $(CPPFLAGS) $(CFLAGS) $(ALT_OPT_CFLAGS)
++
++ AS.S = $(AS) $(ASFLAGS)
++
++--- oldopenjdk/hotspot/agent/src/os/linux/Makefile 2008-03-19 01:02:55.000000000 -0400
+++++ openjdk/hotspot/agent/src/os/linux/Makefile 2008-03-19 10:58:51.000000000 -0400
++@@ -40,7 +40,7 @@
++
++ LIBS = -lthread_db
++
++-CFLAGS = -c -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
+++CFLAGS = -c $(ALT_OPT_CFLAGS) -fPIC -g -D_GNU_SOURCE -D$(ARCH) $(INCLUDES)
++
++ LIBSA = $(ARCH)/libsaproc.so
++
++--- oldopenjdk/corba/make/common/Defs.gmk 2008-02-28 05:04:22.000000000 -0500
+++++ openjdk/corba/make/common/Defs.gmk 2008-03-19 11:37:33.000000000 -0400
++@@ -444,7 +444,7 @@
++ # Tool flags
++ #
++ ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
++-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
+++CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(ALT_OPT_CFLAGS)
++ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
++ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
++ $(DEFINES) $(OPTIONS:%=-D%)
++--- oldopenjdk/jdk/make/common/Defs.gmk 2008-03-19 01:02:55.000000000 -0400
+++++ openjdk/jdk/make/common/Defs.gmk 2008-03-19 11:38:19.000000000 -0400
++@@ -664,7 +664,7 @@
++ # Tool flags
++ #
++ ASFLAGS = $(ASFLAGS_$(VARIANT)) $(ASFLAGS_COMMON) $(OTHER_ASFLAGS)
++-CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS)
+++CFLAGS = $(CFLAGS_$(VARIANT)/BYFILE) $(CFLAGS_COMMON) $(OTHER_CFLAGS) $(ALT_OPT_CFLAGS)
++ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
++ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
++ $(DEFINES) $(OPTIONS:%=-D%)
Index: java-1.6.0-openjdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/java-1.6.0-openjdk.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- java-1.6.0-openjdk.spec 17 Mar 2008 17:41:46 -0000 1.12
+++ java-1.6.0-openjdk.spec 6 Apr 2008 15:29:42 -0000 1.13
@@ -4,9 +4,9 @@
%define gcjbootstrap 0
%define icedteaver 1.0
-%define icedteasnapshot -d7f8439ac6dbb7b038f9af5827e055c9ca8fd2ec
-%define openjdkver b06
-%define openjdkdate 28_feb_2008
+%define icedteasnapshot -0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d
+%define openjdkver b08
+%define openjdkdate 26_mar_2008
%define genurl http://cvs.fedoraproject.org/viewcvs/devel/java-1.6.0-openjdk/
@@ -101,7 +101,7 @@
Name: java-%{javaver}-%{origin}
Version: %{javaver}.%{buildver}
-Release: 0.5.%{openjdkver}%{?dist}
+Release: 0.7.%{openjdkver}%{?dist}.1
# 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
@@ -134,13 +134,18 @@
# FIXME: The licenses in the jhat sources need to be fixed with proper
# GPL Licenses.
Patch2: java-1.6.0-openjdk-jhat.patch
+Patch3: java-1.6.0-openjdk-freetype.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: cups-devel
BuildRequires: giflib-devel
+%if %{?fedora}0
BuildRequires: lesstif-devel
+%else
+BuildRequires: openmotif-devel
+%endif
BuildRequires: libX11-devel
BuildRequires: libXi-devel
BuildRequires: libXp-devel
@@ -164,7 +169,7 @@
BuildRequires: xorg-x11-server-Xvfb
BuildRequires: xorg-x11-fonts-Type1
BuildRequires: xorg-x11-fonts-misc
-BuildRequires: freetype-devel >= 2.3.0
+BuildRequires: freetype-devel
BuildRequires: fontconfig
# Java Access Bridge for GNOME build requirements.
BuildRequires: at-spi-devel
@@ -186,7 +191,7 @@
# cacerts.
Requires: openssl
# Require jpackage-utils for ant
-Requires: jpackage-utils >= 1.7.3-1jpp.3
+Requires: jpackage-utils
# Require zoneinfo data provided by tzdata-java subpackage.
Requires: tzdata-java
# Post requires alternatives to install tool alternatives.
@@ -218,6 +223,8 @@
Provides: jdbc-stdext = 3.0
Provides: java-sasl = %{epoch}:%{version}
+ExclusiveArch: %{x86} x86_64
+
%description
The OpenJDK runtime environment.
@@ -336,6 +343,7 @@
%endif
make stamps/patch.stamp
patch -l -p0 < %{PATCH2}
+patch -l -p1 < %{PATCH3}
make
pushd java-access-bridge-%{accessver}
export JAVA_HOME=$(pwd)/../%{buildoutputdir}/j2sdk-image
@@ -443,9 +451,6 @@
# Install Javadoc documentation.
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}
cp -a %{buildoutputdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-#FIXME: This needs to be fixed upstream.
-iconv -f ISO_8859-1 -t UTF8 $RPM_BUILD_ROOT%{_javadocdir}/%{name}/THIRD_PARTY_README \
- -o $RPM_BUILD_ROOT%{_javadocdir}/%{name}/THIRD_PARTY_README
# Find JRE directories.
find $RPM_BUILD_ROOT%{_jvmdir}/%{jredir} -type d \
@@ -789,6 +794,31 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* Sun Apr 6 2008 Lubomir Kundrak <lkundrak at redhat.com> - 1:1.6.0.0-0.7.b08.1
+- Bootstrap for Red Hat Enterprise Linux 5, to include in EPEL
+
+* Mon Mar 31 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.7.b08
+- Updated icedteasnapshot. Includes sources needed to build xmlgraphics-commons.
+- Updated release.
+- Resolves: rhbz#439676
+
+* Fri Mar 28 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.6.b08
+- Updated icedteasnapshot to fix ppc failure.
+
+* Thu Mar 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.6.b08
+- Removed iconv of THIRD_PARTY_README.
+
+* Thu Mar 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.6.b08
+- Updated icedteasnapshot.
+- Updated openjdkver and openjdkdate.
+- Removed java-1.6.0-openjdk-trademark.patch.
+- Updated generate-fedora-zip.sh.
+- Resolves: rhbz#438421
+
+* Thu Mar 20 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.5.b06
+- Updated icedteasnapshot.
+- Updated java-1.6.0-openjdk-optflags.patch.
+
* Mon Mar 17 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.5.b06
- Updated icedteasnapshot.
- Updated Release.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 17 Mar 2008 17:41:46 -0000 1.9
+++ sources 6 Apr 2008 15:29:42 -0000 1.10
@@ -1,5 +1,5 @@
-7a0c160c03012cd40957a7a112e25038 mauve_tests
-e24e99eeae81f32fa7d958fc75757b83 openjdk-6-src-b06-28_feb_2008-fedora.tar.gz
11d8e6129f27792cc1b0e1a7de2ec127 java-access-bridge-1.22.0.tar.gz
079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz
-48e0b46998e2f593935ff42be1e7c343 icedtea6-1.0-d7f8439ac6dbb7b038f9af5827e055c9ca8fd2ec.tar.gz
+7a0c160c03012cd40957a7a112e25038 mauve_tests
+0da9ac0f77805fa6da6ebd197f8e7be8 icedtea6-1.0-0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d.tar.gz
+a94e67f3182d49902572153fa86f774e openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
--- java-1.6.0-openjdk-trademark.patch DELETED ---
More information about the fedora-extras-commits
mailing list