Tue Jul 15 17:05:08 UTC 2008

Author: langel

Update of /cvs/pkgs/rpms/java-1.6.0-openjdk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11640

Modified Files:
	.cvsignore java-1.6.0-openjdk-optflags.patch 
	java-1.6.0-openjdk.spec sources 
Removed Files:
	java-1.6.0-openjdk-6332953.patch 
	java-1.6.0-openjdk-6542088.patch 
	java-1.6.0-openjdk-6607339.patch 
	java-1.6.0-openjdk-6661918.patch 
	java-1.6.0-openjdk-6685178.patch 
	java-1.6.0-openjdk-sparc-ptracefix.patch 
	java-1.6.0-openjdk-sparc-trapsfix.patch 
	java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch 
	java-1.6.0-openjdk-sparc64-linux.patch 
Log Message:
* Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
- Removed all unneeded patches. Security patches are included in the
new icedtea source.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/.cvsignore,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31

--- .cvsignore	15 Jul 2008 15:52:17 -0000	1.30
+++ .cvsignore	15 Jul 2008 17:04:20 -0000	1.31
@@ -2,4 +2,3 @@
 mauve-2008-03-11.tar.gz
 mauve_tests
 openjdk-6-src-b10_30_may_2008-fedora.tar.gz
-icedtea6-1.3-3cbb75db29a0a37578d40edcb8f75b9b2b534cd1.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- java-1.6.0-openjdk-optflags.patch	5 May 2008 14:40:13 -0000	1.8
+++ java-1.6.0-openjdk-optflags.patch	15 Jul 2008 17:04:20 -0000	1.9
@@ -1,38 +1,81 @@
---- configure.orig	2008-05-05 10:37:01.000000000 -0400
-+++ configure	2008-05-05 10:38:35.000000000 -0400
-@@ -719,6 +719,7 @@
- FILE
- FASTJAR
- ac_ct_FASTJAR
+--- oldconfigure	2008-07-14 12:10:27.000000000 -0400
++++ configure	2008-07-15 12:22:11.000000000 -0400
+@@ -704,6 +704,7 @@
+ CXXDEPMODE
+ am__fastdepCXX_TRUE
+ am__fastdepCXX_FALSE
 +ALT_OPT_CFLAGS
- GAWK
- SYSTEM_GCJ_DIR
- SYSTEM_OPENJDK_DIR
-@@ -5673,6 +5674,10 @@
-   fi
- fi
+ MAKE
+ GZIP
+ ANT
+@@ -4181,6 +4182,9 @@
+ 
+ 
  
-+
 +ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
 +
 +
- if test "x$FASTJAR" = x; then
- 	{ { echo "$as_me:$LINENO: error: Can't find fastjar or jar" >&5
- echo "$as_me: error: Can't find fastjar or jar" >&2;}
-@@ -12960,6 +12965,7 @@
- FILE!$FILE$ac_delim
- FASTJAR!$FASTJAR$ac_delim
- ac_ct_FASTJAR!$ac_ct_FASTJAR$ac_delim
+ 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
+@@ -13414,6 +13418,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
- GAWK!$GAWK$ac_delim
- SYSTEM_GCJ_DIR!$SYSTEM_GCJ_DIR$ac_delim
- SYSTEM_OPENJDK_DIR!$SYSTEM_OPENJDK_DIR$ac_delim
-@@ -13044,7 +13050,7 @@
+ MAKE!$MAKE$ac_delim
+ GZIP!$GZIP$ac_delim
+ ANT!$ANT$ac_delim
+@@ -13421,7 +13426,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
+@@ -13463,6 +13467,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
+@@ -13559,7 +13564,6 @@
+ XULRUNNER_CFLAGS!$XULRUNNER_CFLAGS$ac_delim
+ XULRUNNER_LIBS!$XULRUNNER_LIBS$ac_delim
+ GTK_CFLAGS!$GTK_CFLAGS$ac_delim
+-GTK_LIBS!$GTK_LIBS$ac_delim
+ _ACEOF
+ 
+   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
+@@ -13601,6 +13605,7 @@
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   cat >conf$$subs.sed <<_ACEOF
++GTK_LIBS!$GTK_LIBS$ac_delim
+ MOZILLA_CFLAGS!$MOZILLA_CFLAGS$ac_delim
+ MOZILLA_LIBS!$MOZILLA_LIBS$ac_delim
+ GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim
+@@ -13615,7 +13620,7 @@
  LTLIBOBJS!$LTLIBOBJS$ac_delim
  _ACEOF
  
--  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
      break
    elif $ac_last_try; then
      { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
+--- oldconfigure.ac	2008-07-03 16:51:32.000000000 -0400
++++ configure.ac	2008-07-15 12:21:59.000000000 -0400
+@@ -9,6 +9,9 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+ 
++ALT_OPT_CFLAGS="$(rpm --eval '%optflags' | sed -e 's/-mtune=generic//1')"
++AC_SUBST(ALT_OPT_CFLAGS)
++
+ FIND_TOOL([MAKE], [make])
+ FIND_TOOL([GZIP], [gzip])
+ FIND_TOOL([ANT], [ant])


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.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- java-1.6.0-openjdk.spec	15 Jul 2008 15:57:42 -0000	1.56
+++ java-1.6.0-openjdk.spec	15 Jul 2008 17:04:20 -0000	1.57
@@ -138,16 +138,7 @@
 # applications.
 Patch0:   java-1.6.0-openjdk-optflags.patch
 Patch1:   java-1.6.0-openjdk-java-access-bridge-tck.patch
-Patch2:   java-1.6.0-openjdk-sparc-trapsfix.patch
-Patch3:   java-1.6.0-openjdk-sparc64-linux.patch
-Patch4:   java-1.6.0-openjdk-sparc-ptracefix.patch
-Patch5:   java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch
-# OpenJDK security patches
-Patch6:   java-1.6.0-openjdk-6332953.patch
-Patch7:   java-1.6.0-openjdk-6542088.patch
-Patch8:   java-1.6.0-openjdk-6607339.patch
-Patch9:   java-1.6.0-openjdk-6661918.patch
-Patch10:  java-1.6.0-openjdk-6685178.patch
+Patch2: java-1.6.0-openjdk-makefile.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -342,7 +333,7 @@
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 6
 %setup -q -n icedtea6-%{icedteaver} -T -D -a 2
 %patch0
-%patch5 -p1 -b .sparc64
+%patch2
 cp %{SOURCE4} .
 cp %{SOURCE5} .
 cp %{SOURCE7} .
@@ -356,17 +347,6 @@
 %if %{gcjbootstrap}
 make stamps/patch-ecj.stamp
 %endif
-make stamps/patch.stamp
-patch -l -p1 < %{PATCH2}
-patch -l -p1 < %{PATCH3}
-patch -l -p1 < %{PATCH4}
-patch -l -p0 < %{PATCH6}
-patch -l -p0 < %{PATCH7}
-patch -l -p0 < %{PATCH8}
-%ifarch %{jit_arches}
-patch -l -p0 < %{PATCH9}
-%endif
-patch -l -p0 < %{PATCH10}
 make
 
 export JAVA_HOME=$(pwd)/%{buildoutputdir}/j2sdk-image
@@ -908,6 +888,10 @@
 
 %changelog
 * Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
+- Removed all unneeded patches. Security patches are included in the 
+new icedtea source.
+
+* Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10
 - Fixed fedorazip.
 
 * Tue Jul 15 2008 Lillian Angel <langel at redhat.com> - 1:1.6.0.0-0.18.b10


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/java-1.6.0-openjdk/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	15 Jul 2008 15:52:17 -0000	1.30
+++ sources	15 Jul 2008 17:04:20 -0000	1.31
@@ -2,4 +2,3 @@
 079e5dc01f2a8720ee3b3dd39119a601  mauve-2008-03-11.tar.gz
 7a0c160c03012cd40957a7a112e25038  mauve_tests
 5a8537503058edaeff587d45fc167631  openjdk-6-src-b10_30_may_2008-fedora.tar.gz
-d35b57c1046a9866912bf66f13d16c55  icedtea6-1.3-3cbb75db29a0a37578d40edcb8f75b9b2b534cd1.tar.gz


--- java-1.6.0-openjdk-6332953.patch DELETED ---


--- java-1.6.0-openjdk-6542088.patch DELETED ---


--- java-1.6.0-openjdk-6607339.patch DELETED ---


--- java-1.6.0-openjdk-6661918.patch DELETED ---


--- java-1.6.0-openjdk-6685178.patch DELETED ---


--- java-1.6.0-openjdk-sparc-ptracefix.patch DELETED ---


--- java-1.6.0-openjdk-sparc-trapsfix.patch DELETED ---


--- java-1.6.0-openjdk-sparc64-INSTALL_ARCH_DIR.patch DELETED ---


--- java-1.6.0-openjdk-sparc64-linux.patch DELETED ---


