rpms/java-1.6.0-openjdk/devel .cvsignore, 1.14, 1.15 java-1.6.0-openjdk-optflags.patch, 1.4, 1.5 java-1.6.0-openjdk.spec, 1.18, 1.19 sources, 1.13, 1.14
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Tue Apr 8 15:44:51 UTC 2008
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10775
Modified Files:
.cvsignore java-1.6.0-openjdk-optflags.patch
java-1.6.0-openjdk.spec sources
Log Message:
* Mon Apr 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.8.b08
- Updated sources.
- Updated icedteaver.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 1 Apr 2008 03:27:29 -0000 1.14
+++ .cvsignore 8 Apr 2008 15:44:08 -0000 1.15
@@ -2,4 +2,4 @@
java-access-bridge-1.22.0.tar.gz
mauve-2008-03-11.tar.gz
openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
-icedtea6-1.0-0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d.tar.gz
+icedtea6-1.1-c8437bd435d8452a40fc7dd830cec5769bbe5d01.tar.gz
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/devel/java-1.6.0-openjdk-optflags.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- java-1.6.0-openjdk-optflags.patch 1 Apr 2008 12:49:35 -0000 1.4
+++ java-1.6.0-openjdk-optflags.patch 8 Apr 2008 15:44:08 -0000 1.5
@@ -1,114 +1,3 @@
---- 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)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-@@ -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)" \
- "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
-@@ -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)
---- 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
-+ALT_OPT_CFLAGS
- BUILD_ARCH_DIR
- INSTALL_ARCH_DIR
- JAVA
-@@ -5591,6 +5592,9 @@
- fi
-
-
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+
-+
-
- case "${host}" in
- x86_64-*-*)
-@@ -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
-+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
-@@ -12632,7 +12637,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- 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
--- 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 @@
@@ -171,3 +60,124 @@
+ CXXFLAGS = $(CXXFLAGS_$(VARIANT)/BYFILE) $(CXXFLAGS_COMMON) $(OTHER_CXXFLAGS)
+ CPPFLAGS = $(CPPFLAGS_$(VARIANT)) $(CPPFLAGS_COMMON) $(OTHER_CPPFLAGS) \
+ $(DEFINES) $(OPTIONS:%=-D%)
+--- Makefile.am.orig 2008-04-08 11:35:27.000000000 -0400
++++ Makefile.am 2008-04-08 11:36:57.000000000 -0400
+@@ -97,7 +97,8 @@
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+- "FT2_LIB=$(FREETYPE2_LIBS)"
++ "FT2_LIB=$(FREETYPE2_LIBS)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)"
+
+ if WITH_CACAO
+ ICEDTEA_ENV += \
+@@ -152,7 +153,8 @@
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+- "FT2_LIB=$(FREETYPE2_LIBS)"
++ "FT2_LIB=$(FREETYPE2_LIBS)" \
++ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)"
+
+ if WITH_CACAO
+ ICEDTEA_ENV_ECJ += \
+@@ -289,6 +291,7 @@
+ patches/icedtea-zero-build.patch \
+ patches/icedtea-print-lsb-release.patch \
+ patches/icedtea-jpegclasses.patch \
++ patches/icedtea-optflags.patch \
+ patches/icedtea-arm-uname.patch \
+ $(GCC_PATCH) \
+ $(FAST_BUILD_PATCH) \
+--- Makefile.in.orig 2008-04-08 11:35:34.000000000 -0400
++++ Makefile.in 2008-04-08 11:38:19.000000000 -0400
+@@ -79,6 +79,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@
+@@ -295,7 +296,8 @@
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+- "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_1) $(am__append_2)
++ "FT2_LIB=$(FREETYPE2_LIBS)" "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
++ $(am__append_1) $(am__append_2)
+
+ # OpenJDK ecj build environment.
+ ICEDTEA_BUILD_DIR_ECJ = \
+@@ -332,7 +334,8 @@
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+- "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_3) $(am__append_4)
++ "FT2_LIB=$(FREETYPE2_LIBS)" "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
++ $(am__append_3) $(am__append_4)
+
+ # OpenJDK Source Preparation Targets
+ # ==================================
+@@ -392,8 +395,9 @@
+ patches/icedtea-zero-build.patch \
+ patches/icedtea-print-lsb-release.patch \
+ patches/icedtea-jpegclasses.patch \
+- patches/icedtea-arm-uname.patch $(GCC_PATCH) \
+- $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_5)
++ patches/icedtea-optflags.patch patches/icedtea-arm-uname.patch \
++ $(GCC_PATCH) $(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) \
++ $(am__append_5)
+
+ # Patch OpenJDK for plug replacements and ecj.
+ ICEDTEA_ECJ_PATCH = patches/icedtea-ecj.patch
+--- configure.ac.orig 2008-04-08 11:35:42.000000000 -0400
++++ configure.ac 2008-04-08 11:38:14.000000000 -0400
+@@ -28,6 +28,9 @@
+ dnl check for it explicitly rather than using AC_PROG_AWK.
+ FIND_TOOL([GAWK], [gawk])
+
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++AC_SUBST(ALT_OPT_CFLAGS)
++
+ AC_ARG_WITH([gcj-home],
+ [AS_HELP_STRING([--with-gcj-home],
+ [gcj home directory \
+--- configure.orig 2008-04-08 11:35:48.000000000 -0400
++++ configure 2008-04-08 11:38:17.000000000 -0400
+@@ -717,6 +717,7 @@
+ FASTJAR
+ ac_ct_FASTJAR
+ GAWK
++ALT_OPT_CFLAGS
+ SYSTEM_GCJ_DIR
+ SYSTEM_OPENJDK_DIR
+ SYSTEM_ICEDTEA_DIR
+@@ -5457,6 +5458,9 @@
+
+
+
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++
++
+
+ # Check whether --with-gcj-home was given.
+ if test "${with_gcj_home+set}" = set; then
+@@ -12581,6 +12585,7 @@
+ FASTJAR!$FASTJAR$ac_delim
+ ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
+ GAWK!$GAWK$ac_delim
++ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
+ SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
+ SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim
+ SYSTEM_ICEDTEA_DIR!$SYSTEM_ICEDTEA_DIR$ac_delim
+@@ -12663,7 +12668,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+
+- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
++ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
+ break
+ elif $ac_last_try; then
+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- java-1.6.0-openjdk.spec 8 Apr 2008 15:17:35 -0000 1.18
+++ java-1.6.0-openjdk.spec 8 Apr 2008 15:44:08 -0000 1.19
@@ -3,8 +3,8 @@
# java-1.6.0-openjdk-devel.
%define gcjbootstrap 0
-%define icedteaver 1.0
-%define icedteasnapshot -0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d
+%define icedteaver 1.1
+%define icedteasnapshot -c8437bd435d8452a40fc7dd830cec5769bbe5d01
%define openjdkver b08
%define openjdkdate 26_mar_2008
@@ -791,6 +791,10 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* Mon Apr 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.8.b08
+- Updated sources.
+- Updated icedteaver.
+
* Mon Apr 07 2008 Dennis Gilmore <dennis at ausil.us> - 1:1.6.0.0-0.8.b08
- enable building for all arches using zero where there is not a native port
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources 1 Apr 2008 03:27:29 -0000 1.13
+++ sources 8 Apr 2008 15:44:08 -0000 1.14
@@ -2,4 +2,4 @@
11d8e6129f27792cc1b0e1a7de2ec127 java-access-bridge-1.22.0.tar.gz
079e5dc01f2a8720ee3b3dd39119a601 mauve-2008-03-11.tar.gz
a94e67f3182d49902572153fa86f774e openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
-0da9ac0f77805fa6da6ebd197f8e7be8 icedtea6-1.0-0fd2fbf0dfd0a8102c1af5316a528c6b1fa05e8d.tar.gz
+badf0330bab064edfd4a295e27be0f2e icedtea6-1.1-c8437bd435d8452a40fc7dd830cec5769bbe5d01.tar.gz
More information about the fedora-extras-commits
mailing list