rpms/java-1.6.0-openjdk/devel .cvsignore, 1.38, 1.39 java-1.6.0-openjdk-makefile.patch, 1.8, 1.9 java-1.6.0-openjdk-optflags.patch, 1.10, 1.11 java-1.6.0-openjdk.spec, 1.69, 1.70 sources, 1.38, 1.39
Lillian Angel
langel at fedoraproject.org
Mon Sep 8 13:07:48 UTC 2008
Author: langel
Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29418
Modified Files:
.cvsignore java-1.6.0-openjdk-makefile.patch
java-1.6.0-openjdk-optflags.patch java-1.6.0-openjdk.spec
sources
Log Message:
* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
- Added rhino requirement.
- Resolves: rhbz#461336
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- .cvsignore 5 Aug 2008 13:56:48 -0000 1.38
+++ .cvsignore 8 Sep 2008 13:07:18 -0000 1.39
@@ -2,5 +2,3 @@
mauve_tests
java-access-bridge-1.23.0.tar.gz
openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
-
-icedtea6-1.3-63c7ccd8da7f0e7c8e5a1e3c8dc3389efcd74223.tar.gz
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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- java-1.6.0-openjdk-makefile.patch 5 Aug 2008 14:45:33 -0000 1.8
+++ java-1.6.0-openjdk-makefile.patch 8 Sep 2008 13:07:18 -0000 1.9
@@ -17,22 +17,3 @@
mkdir -p stamps ; \
rm -f stamps/patch.stamp.tmp ; \
touch stamps/patch.stamp.tmp ; \
---- makein 2008-08-05 10:44:14.000000000 -0400
-+++ Makefile.in 2008-08-05 10:44:53.000000000 -0400
-@@ -963,7 +963,6 @@
- mkdir openjdk ; \
- $(TAR) xf $(OPENJDK_SRC_ZIP) -C openjdk; \
- chmod -R ug+w openjdk ; \
-- sh $(srcdir)/fsg.sh ; \
- fi
- @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ if ! test -d cacao ; \
- @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@ then \
-@@ -991,7 +990,7 @@
- clean-extract:
- rm -f stamps/extract.stamp
-
--stamps/patch.stamp: stamps/patch-fsg.stamp
-+stamps/patch.stamp: stamps/extract.stamp
- mkdir -p stamps ; \
- rm -f stamps/patch.stamp.tmp ; \
- touch stamps/patch.stamp.tmp ; \
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- java-1.6.0-openjdk-optflags.patch 5 Aug 2008 14:20:12 -0000 1.10
+++ java-1.6.0-openjdk-optflags.patch 8 Sep 2008 13:07:18 -0000 1.11
@@ -10,72 +10,3 @@
FIND_TOOL([MAKE], [make])
FIND_TOOL([GZIP], [gzip])
FIND_TOOL([ANT], [ant])
---- configorig 2008-08-05 10:16:22.000000000 -0400
-+++ configure 2008-08-05 10:16:33.000000000 -0400
-@@ -704,6 +704,7 @@
- CXXDEPMODE
- am__fastdepCXX_TRUE
- am__fastdepCXX_FALSE
-+ALT_OPT_CFLAGS
- MAKE
- GZIP
- ANT
-@@ -4200,6 +4201,9 @@
-
-
-
-+ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
-+
-+
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}make", so it can be a program name with args.
- set dummy ${ac_tool_prefix}make; ac_word=$2
-@@ -13479,6 +13483,7 @@
- CXXDEPMODE!$CXXDEPMODE$ac_delim
- am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
- am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
-+ALT_OPT_CFLAGS!$ALT_OPT_CFLAGS$ac_delim
- MAKE!$MAKE$ac_delim
- GZIP!$GZIP$ac_delim
- ANT!$ANT$ac_delim
-@@ -13486,7 +13491,6 @@
- PATCH!$PATCH$ac_delim
- TAR!$TAR$ac_delim
- CHMOD!$CHMOD$ac_delim
--MD5SUM!$MD5SUM$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -13528,6 +13532,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+MD5SUM!$MD5SUM$ac_delim
- WGET!$WGET$ac_delim
- ZIP!$ZIP$ac_delim
- UNZIP!$UNZIP$ac_delim
-@@ -13624,7 +13629,6 @@
- X11_LIBS!$X11_LIBS$ac_delim
- XINERAMA_CFLAGS!$XINERAMA_CFLAGS$ac_delim
- XINERAMA_LIBS!$XINERAMA_LIBS$ac_delim
--LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim
- _ACEOF
-
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -13666,6 +13670,7 @@
- ac_delim='%!_!# '
- for ac_last_try in false false false false false :; do
- cat >conf$$subs.sed <<_ACEOF
-+LIBPNG_CFLAGS!$LIBPNG_CFLAGS$ac_delim
- LIBPNG_LIBS!$LIBPNG_LIBS$ac_delim
- XTST_CFLAGS!$XTST_CFLAGS$ac_delim
- XTST_LIBS!$XTST_LIBS$ac_delim
-@@ -13691,7 +13696,7 @@
- LTLIBOBJS!$LTLIBOBJS$ac_delim
- _ACEOF
-
-- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 23; then
-+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 24; 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.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- java-1.6.0-openjdk.spec 5 Aug 2008 13:56:48 -0000 1.69
+++ java-1.6.0-openjdk.spec 8 Sep 2008 13:07:18 -0000 1.70
@@ -4,10 +4,10 @@
%define gcjbootstrap 0
# If runtests is 0 test suites will not be run.
-%define runtests 1
+%define runtests 0
%define icedteaver 1.3
-%define icedteasnapshot -63c7ccd8da7f0e7c8e5a1e3c8dc3389efcd74223
+%define icedteasnapshot -94838da771970032c91d65eb2588e2f916055aad
%define openjdkver b11
%define openjdkdate 10_jul_2008
@@ -194,6 +194,7 @@
BuildRequires: libffi-devel
%endif
+Requires: rhino
Requires: libjpeg = 6b
%if 0%{?fedora} > 9
# Require /etc/pki/java/cacerts.
@@ -355,6 +356,7 @@
%ifarch sparc64
export ARCH_DATA_MODEL=64
%endif
+./autogen.sh
./configure %{icedteaopt} --with-openjdk-src-zip=%{SOURCE1}
%if %{gcjbootstrap}
make stamps/patch-ecj.stamp
@@ -901,6 +903,10 @@
%{_jvmdir}/%{jredir}/lib/%{archinstall}/gcjwebplugin.so
%changelog
+* Mon Sep 08 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0-0.20.b11
+- Added rhino requirement.
+- Resolves: rhbz#461336
+
* Tue Aug 05 2008 Lillian Angel <langel at redhat.com> 1:1.6.0-0.20.b11
- Updated icedteasnapshot.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 5 Aug 2008 13:56:48 -0000 1.38
+++ sources 8 Sep 2008 13:07:18 -0000 1.39
@@ -2,4 +2,3 @@
7a0c160c03012cd40957a7a112e25038 mauve_tests
1db4280d3228f20ad39ad22382ce2b00 java-access-bridge-1.23.0.tar.gz
0997dea46b42ed9bbebff8cbe5f70aa0 openjdk-6-src-b11-10_jul_2008-fedora.tar.gz
-4c94a16c43c7fd5e1e764bd1b40b7fa0 icedtea6-1.3-63c7ccd8da7f0e7c8e5a1e3c8dc3389efcd74223.tar.gz
More information about the fedora-extras-commits
mailing list