rpms/java-1.6.0-openjdk/devel .cvsignore, 1.11, 1.12 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.2, 1.3 java-1.6.0-openjdk.spec, 1.13, 1.14 sources, 1.10, 1.11 java-1.6.0-openjdk-trademark.patch, 1.1, NONE
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Thu Mar 27 17:40:08 UTC 2008
- Previous message (by thread): rpms/checkpolicy/devel checkpolicy.spec,1.127,1.128
- Next message (by thread): rpms/python-virtinst/devel virtinst-0.300.3-fix-default-arch.patch, NONE, 1.1 virtinst-0.300.3-fv-extraargs.patch, NONE, 1.1 virtinst-0.300.3-keep-qemu-cdrom.patch, NONE, 1.1 virtinst-0.300.3-update-polish-trans.patch, NONE, 1.1 python-virtinst.spec, 1.36, 1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22063
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
Removed Files:
java-1.6.0-openjdk-trademark.patch
Log Message:
* Thu Mar 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.6.b06
- Updated icedteasnapshot.
- Updated openjdkver and openjdkdate.
- Removed java-1.6.0-openjdk-trademark.patch.
- Updated generate-fedora-zip.sh.
- Resolves: rhbz#438421
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore 20 Mar 2008 18:33:23 -0000 1.11
+++ .cvsignore 27 Mar 2008 17:39:29 -0000 1.12
@@ -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-78e1287fc42757d4c23bb8e7b711e2c91513db58.tar.gz
+openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
+icedtea6-1.0-875f25aaaac9763f545a6be775ffec2b41be9c94.tar.gz
Index: generate-fedora-zip.sh
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/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 27 Mar 2008 17:39:29 -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/devel/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 27 Mar 2008 17:39:29 -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/devel/java-1.6.0-openjdk-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- java-1.6.0-openjdk-optflags.patch 20 Mar 2008 18:33:23 -0000 1.2
+++ java-1.6.0-openjdk-optflags.patch 27 Mar 2008 17:39:29 -0000 1.3
@@ -1,23 +1,85 @@
-diff -r 9e9a92bb08c4 Makefile.am
---- a/Makefile.am Tue Mar 18 17:50:29 2008 +0100
-+++ Makefile.am Wed Mar 19 11:52:35 2008 -0400
-@@ -96,6 +96,7 @@ ICEDTEA_ENV = \
+diff -r 9e9a92bb08c4 patches/icedtea-optflags.patch
+--- /dev/null Thu Jan 01 00:00:00 1970 +0000
++++ patches/icedtea-optflags.patch Wed Mar 19 11:52:35 2008 -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 @@
++ #include <string.h>
++ #undef bzero
++ inline void bzero(void *b, int len) { memset(b,0,len); }
++-#undef bcopy
++-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
+++//#undef bcopy
+++//inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
++ #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%)
+--- oldicedtea6/Makefile.am 2008-03-27 10:02:20.000000000 -0400
++++ Makefile.am 2008-03-27 13:19:02.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)" \
-+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
"FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
- "FT2_LIB=$(FREETYPE2_LIBS)"
-
-@@ -138,6 +139,7 @@ ICEDTEA_ENV_ECJ = \
- "LD_LIBRARY_PATH=" \
- "GENSRCDIR=$(abs_top_srcdir)/generated" \
- "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+@@ -144,6 +145,7 @@
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
- "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
- "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
-@@ -273,6 +275,7 @@ ICEDTEA_PATCHES = \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" \
+ "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+@@ -277,6 +279,7 @@
patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
patches/icedtea-print-lsb-release.patch \
@@ -25,21 +87,9 @@
$(GCC_PATCH) \
$(FAST_BUILD_PATCH) \
$(DISTRIBUTION_PATCHES)
-diff -r 9e9a92bb08c4 Makefile.in
---- a/Makefile.in Tue Mar 18 17:50:29 2008 +0100
-+++ Makefile.in Wed Mar 19 11:52:35 2008 -0400
-@@ -1,8 +1,8 @@
--# Makefile.in generated by automake 1.10.1 from Makefile.am.
-+# Makefile.in generated by automake 1.10 from Makefile.am.
- # @configure_input@
-
- # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
--# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -72,6 +72,7 @@ ALSA_CFLAGS = @ALSA_CFLAGS@
+--- oldicedtea6/Makefile.in 2008-03-27 10:02:25.000000000 -0400
++++ Makefile.in 2008-03-27 13:19:07.000000000 -0400
+@@ -73,6 +73,7 @@
ALSA_CFLAGS = @ALSA_CFLAGS@
ALSA_LIBS = @ALSA_LIBS@
ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
@@ -47,24 +97,24 @@
AMTAR = @AMTAR@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
-@@ -285,6 +286,7 @@ ICEDTEA_ENV = "ALT_JDK_IMPORT_PATH=$(ICE
+@@ -285,6 +285,7 @@
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
"ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
"ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
- "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "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)
-
-@@ -315,6 +317,7 @@ ICEDTEA_ENV_ECJ = "ALT_JDK_IMPORT_PATH=$
- $(ICEDTEA_RT):$(LIBGCJ_JAR)" "CLASSPATH=" "LD_LIBRARY_PATH=" \
- "GENSRCDIR=$(abs_top_srcdir)/generated" \
- "ICEDTEA_CORE_BUILD=$(ICEDTEA_CORE_BUILD)" \
+@@ -322,6 +323,7 @@
+ "ZERO_ENDIANNESS=$(ZERO_ENDIANNESS)" \
+ "ZERO_ARCHDEF=$(ZERO_ARCHDEF)" \
+ "ZERO_ARCHFLAG=$(ZERO_ARCHFLAG)" \
+ "ALT_OPT_CFLAGS=$(ALT_OPT_CFLAGS)" \
- "ICEDTEA_ZERO_BUILD=$(ICEDTEA_ZERO_BUILD)" \
- "ZERO_LIBARCH=$(ZERO_LIBARCH)" \
- "ZERO_BITSPERWORD=$(ZERO_BITSPERWORD)" \
-@@ -382,7 +385,8 @@ ICEDTEA_PATCHES = $(ZERO_PATCHES_COND) \
- patches/icedtea-lesstif-64.patch \
+ "LIBFFI_CFLAGS=$(LIBFFI_CFLAGS)" "LIBFFI_LIBS=$(LIBFFI_LIBS)" \
+ "FREETYPE2_HEADERS=$(FREETYPE2_CFLAGS)" \
+ "FT2_LIB=$(FREETYPE2_LIBS)" $(am__append_2)
+@@ -381,7 +383,8 @@
+ patches/icedtea-timerqueue.patch \
patches/icedtea-generated.patch patches/icedtea-lib64.patch \
patches/icedtea-zero-build.patch \
- patches/icedtea-print-lsb-release.patch $(GCC_PATCH) \
@@ -73,175 +123,21 @@
$(FAST_BUILD_PATCH) $(DISTRIBUTION_PATCHES) $(am__append_3)
# Patch OpenJDK for plug replacements and ecj.
-@@ -524,10 +528,6 @@ dist-bzip2: distdir
- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
- $(am__remove_distdir)
-
--dist-lzma: distdir
-- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
-- $(am__remove_distdir)
--
- dist-tarZ: distdir
- tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
- $(am__remove_distdir)
-@@ -554,8 +554,6 @@ distcheck: dist
- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
- *.tar.bz2*) \
- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-- *.tar.lzma*) \
-- unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
- *.tar.Z*) \
- uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
- *.shar.gz*) \
-@@ -699,17 +697,17 @@ uninstall-am:
- .MAKE: install-am install-strip
-
- .PHONY: all all-am all-local am--refresh check check-am clean \
-- clean-generic dist dist-all dist-bzip2 dist-gzip dist-lzma \
-- dist-shar dist-tarZ dist-zip distcheck distclean \
-- distclean-generic distclean-local distcleancheck distdir \
-- distuninstallcheck dvi dvi-am html html-am info info-am \
-- install install-am install-data install-data-am install-dvi \
-- install-dvi-am install-exec install-exec-am install-html \
-- install-html-am install-info install-info-am install-man \
-- install-pdf install-pdf-am install-ps install-ps-am \
-- install-strip installcheck installcheck-am installdirs \
-- maintainer-clean maintainer-clean-generic mostlyclean \
-- mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
-+ clean-generic dist dist-all dist-bzip2 dist-gzip dist-shar \
-+ dist-tarZ dist-zip distcheck distclean distclean-generic \
-+ distclean-local distcleancheck distdir distuninstallcheck dvi \
-+ dvi-am html html-am info info-am install install-am \
-+ install-data install-data-am install-dvi install-dvi-am \
-+ install-exec install-exec-am install-html install-html-am \
-+ install-info install-info-am install-man install-pdf \
-+ install-pdf-am install-ps install-ps-am install-strip \
-+ installcheck installcheck-am installdirs maintainer-clean \
-+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-+ pdf-am ps ps-am uninstall uninstall-am
-
-
- # Top-Level Targets
-diff -r 9e9a92bb08c4 aclocal.m4
---- a/aclocal.m4 Tue Mar 18 17:50:29 2008 +0100
-+++ aclocal.m4 Wed Mar 19 11:52:35 2008 -0400
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-+# 2005, 2006 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,13 +11,10 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
--m4_ifndef([AC_AUTOCONF_VERSION],
-- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(AC_AUTOCONF_VERSION, [2.61],,
--[m4_warning([this file was generated for autoconf 2.61.
--You have another version of autoconf. It may work, but is not guaranteed to.
--If you have problems, you may need to regenerate the build system entirely.
--To do so, use the procedure documented by the package, typically `autoreconf'.])])
-+m4_if(m4_PACKAGE_VERSION, [2.61],,
-+[m4_fatal([this file was generated for autoconf 2.61.
-+You have another version of autoconf. If you want to use that,
-+you should regenerate the build system entirely.], [63])])
-
- # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
- #
-@@ -177,7 +174,7 @@ fi[]dnl
- fi[]dnl
- ])# PKG_CHECK_MODULES
-
--# Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
-@@ -192,7 +189,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
- [am__api_version='1.10'
- dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
- dnl require some minimum version. Point them to the right macro.
--m4_if([$1], [1.10.1], [],
-+m4_if([$1], [1.10], [],
- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
- ])
-
-@@ -208,10 +205,8 @@ m4_define([_AM_AUTOCONF_VERSION], [])
- # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
- # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
- AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
--[AM_AUTOMAKE_VERSION([1.10.1])dnl
--m4_ifndef([AC_AUTOCONF_VERSION],
-- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--_AM_AUTOCONF_VERSION(AC_AUTOCONF_VERSION)])
-+[AM_AUTOMAKE_VERSION([1.10])dnl
-+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
-
- # AM_AUX_DIR_EXPAND -*- Autoconf -*-
-
-@@ -483,7 +478,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
- dirpart=`AS_DIRNAME("$mf")`
- else
- continue
-@@ -531,13 +526,13 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS]
- # Do all the work for Automake. -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005, 2006, 2008 Free Software Foundation, Inc.
-+# 2005, 2006 Free Software Foundation, Inc.
- #
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-
--# serial 13
-+# serial 12
-
- # This macro actually does too much. Some checks are only needed if
- # your package does certain things. But this isn't really a big deal.
-@@ -642,17 +637,16 @@ AC_PROVIDE_IFELSE([AC_PROG_OBJC],
- # our stamp files there.
- AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
- [# Compute $1's index in $config_headers.
--_am_arg=$1
- _am_stamp_count=1
- for _am_header in $config_headers :; do
- case $_am_header in
-- $_am_arg | $_am_arg:* )
-+ $1 | $1:* )
- break ;;
- * )
- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
- esac
- done
--echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
- # Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
- #
-@@ -941,7 +935,7 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
- # _AM_SUBST_NOTMAKE(VARIABLE)
- # ---------------------------
--# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
-+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
- # This macro is traced by Automake.
- AC_DEFUN([_AM_SUBST_NOTMAKE])
+--- oldicedtea6/configure.ac 2008-03-20 10:23:58.000000000 -0400
++++ configure.ac 2008-03-27 13:19:21.000000000 -0400
+@@ -131,6 +131,9 @@
+ ])
+ AM_CONDITIONAL(WITH_OPENJDK, test "${with_openjdk}" == true)
-diff -r 9e9a92bb08c4 configure
---- a/configure Tue Mar 18 17:50:29 2008 +0100
-+++ configure Wed Mar 19 11:52:35 2008 -0400
-@@ -724,6 +724,7 @@ WITH_ICEDTEA_FALSE
++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
+--- oldicedtea6/configure 2008-03-26 09:54:26.000000000 -0400
++++ configure 2008-03-27 13:19:24.000000000 -0400
+@@ -724,6 +724,7 @@
WITH_ICEDTEA_FALSE
WITH_OPENJDK_TRUE
WITH_OPENJDK_FALSE
@@ -249,7 +145,7 @@
BUILD_ARCH_DIR
INSTALL_ARCH_DIR
JAVA
-@@ -5371,6 +5372,9 @@ fi
+@@ -5371,6 +5372,9 @@
fi
@@ -259,7 +155,7 @@
case "${host}" in
x86_64-*-*)
-@@ -12333,6 +12337,7 @@ WITH_ICEDTEA_FALSE!$WITH_ICEDTEA_FALSE$a
+@@ -12339,6 +12343,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
@@ -267,7 +163,7 @@
BUILD_ARCH_DIR!$BUILD_ARCH_DIR$ac_delim
INSTALL_ARCH_DIR!$INSTALL_ARCH_DIR$ac_delim
JAVA!$JAVA$ac_delim
-@@ -12404,7 +12409,7 @@ LTLIBOBJS!$LTLIBOBJS$ac_delim
+@@ -12410,7 +12415,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
@@ -276,88 +172,3 @@
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
-@@ -12726,7 +12731,7 @@ echo "$as_me: executing $ac_file command
- # each Makefile.in and add a new line on top of each file to say so.
- # Grep'ing the whole file is not good either: AIX grep has a line
- # limit of 2048, but all sed's we know have understand at least 4000.
-- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
-+ if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
- dirpart=`$as_dirname -- "$mf" ||
- $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$mf" : 'X\(//\)[^/]' \| \
-diff -r 9e9a92bb08c4 configure.ac
---- a/configure.ac Tue Mar 18 17:50:29 2008 +0100
-+++ configure.ac Wed Mar 19 11:52:35 2008 -0400
-@@ -130,6 +130,9 @@ AC_ARG_WITH([openjdk],
- with_openjdk=false
- ])
- 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
-diff -r 9e9a92bb08c4 patches/icedtea-optflags.patch
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ patches/icedtea-optflags.patch Wed Mar 19 11:52:35 2008 -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 @@
-+ #include <string.h>
-+ #undef bzero
-+ inline void bzero(void *b, int len) { memset(b,0,len); }
-+-#undef bcopy
-+-inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
-++//#undef bcopy
-++//inline void bcopy(const void *s, void *d, size_t len) { memmove(d,s,len); }
-+ #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/devel/java-1.6.0-openjdk.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- java-1.6.0-openjdk.spec 20 Mar 2008 18:33:23 -0000 1.13
+++ java-1.6.0-openjdk.spec 27 Mar 2008 17:39:29 -0000 1.14
@@ -4,9 +4,9 @@
%define gcjbootstrap 0
%define icedteaver 1.0
-%define icedteasnapshot -78e1287fc42757d4c23bb8e7b711e2c91513db58
-%define openjdkver b06
-%define openjdkdate 28_feb_2008
+%define icedteasnapshot -875f25aaaac9763f545a6be775ffec2b41be9c94
+%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.6.%{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
@@ -789,6 +789,13 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* Thu Mar 27 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.6.b06
+- 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.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 20 Mar 2008 18:33:23 -0000 1.10
+++ sources 27 Mar 2008 17:39:29 -0000 1.11
@@ -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
-2bb16faa98fcfbb74983232ad73b1ddf icedtea6-1.0-78e1287fc42757d4c23bb8e7b711e2c91513db58.tar.gz
+6d68680a5eb8e7063175ee63d3393542 icedtea6-1.0-875f25aaaac9763f545a6be775ffec2b41be9c94.tar.gz
+a94e67f3182d49902572153fa86f774e openjdk-6-src-b08-26_mar_2008-fedora.tar.gz
--- java-1.6.0-openjdk-trademark.patch DELETED ---
- Previous message (by thread): rpms/checkpolicy/devel checkpolicy.spec,1.127,1.128
- Next message (by thread): rpms/python-virtinst/devel virtinst-0.300.3-fix-default-arch.patch, NONE, 1.1 virtinst-0.300.3-fv-extraargs.patch, NONE, 1.1 virtinst-0.300.3-keep-qemu-cdrom.patch, NONE, 1.1 virtinst-0.300.3-update-polish-trans.patch, NONE, 1.1 python-virtinst.spec, 1.36, 1.37
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list