rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-makefile.patch, 1.6, 1.7 java-1.6.0-openjdk-optflags.patch, 1.9, 1.10

Lillian Angel (langel) fedora-extras-commits at redhat.com
Tue Aug 5 14:20:42 UTC 2008 

Author: langel

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

Modified Files:
	java-1.6.0-openjdk-makefile.patch 
	java-1.6.0-openjdk-optflags.patch 
Log Message:
Updated patches



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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- java-1.6.0-openjdk-makefile.patch	16 Jul 2008 15:26:28 -0000	1.6
+++ java-1.6.0-openjdk-makefile.patch	5 Aug 2008 14:20:12 -0000	1.7
@@ -17,25 +17,25 @@
  	mkdir -p stamps ; \
  	rm -f stamps/patch.stamp.tmp ; \
  	touch stamps/patch.stamp.tmp ; \
---- oldMakefile.in	2008-07-16 10:10:02.000000000 -0400
-+++ Makefile.in	2008-07-16 11:24:00.000000000 -0400
-@@ -91,6 +91,7 @@
- ALSA_LIBS = @ALSA_LIBS@
- ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@
+--- Makefileinorig	2008-08-05 10:19:02.000000000 -0400
++++ Makefile.in	2008-08-05 10:19:17.000000000 -0400
+@@ -93,6 +93,7 @@
+ ALT_NETBEANS_PLATFORM_SRC_ZIP = @ALT_NETBEANS_PLATFORM_SRC_ZIP@
+ ALT_NETBEANS_PROFILER_SRC_ZIP = @ALT_NETBEANS_PROFILER_SRC_ZIP@
  ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
 +ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
+ ALT_VISUALVM_SRC_ZIP = @ALT_VISUALVM_SRC_ZIP@
  AMTAR = @AMTAR@
  ANT = @ANT@
- AUTOCONF = @AUTOCONF@
-@@ -911,7 +912,6 @@
+@@ -963,7 +964,6 @@
  	  mkdir openjdk ; \
- 	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C 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 \
-@@ -929,7 +929,7 @@
+@@ -991,7 +991,7 @@
  clean-extract:
  	rm -f stamps/extract.stamp
  

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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- java-1.6.0-openjdk-optflags.patch	15 Jul 2008 17:04:20 -0000	1.9
+++ java-1.6.0-openjdk-optflags.patch	5 Aug 2008 14:20:12 -0000	1.10
@@ -1,5 +1,17 @@
---- oldconfigure	2008-07-14 12:10:27.000000000 -0400
-+++ configure	2008-07-15 12:22:11.000000000 -0400
+--- configacorig	2008-08-05 10:16:04.000000000 -0400
++++ configure.ac	2008-08-05 10:16:15.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])
+--- 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
@@ -8,7 +20,7 @@
  MAKE
  GZIP
  ANT
-@@ -4181,6 +4182,9 @@
+@@ -4200,6 +4201,9 @@
  
  
  
@@ -18,7 +30,7 @@
  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 @@
+@@ -13479,6 +13483,7 @@
  CXXDEPMODE!$CXXDEPMODE$ac_delim
  am__fastdepCXX_TRUE!$am__fastdepCXX_TRUE$ac_delim
  am__fastdepCXX_FALSE!$am__fastdepCXX_FALSE$ac_delim
@@ -26,7 +38,7 @@
  MAKE!$MAKE$ac_delim
  GZIP!$GZIP$ac_delim
  ANT!$ANT$ac_delim
-@@ -13421,7 +13426,6 @@
+@@ -13486,7 +13491,6 @@
  PATCH!$PATCH$ac_delim
  TAR!$TAR$ac_delim
  CHMOD!$CHMOD$ac_delim
@@ -34,7 +46,7 @@
  _ACEOF
  
    if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
-@@ -13463,6 +13467,7 @@
+@@ -13528,6 +13532,7 @@
  ac_delim='%!_!# '
  for ac_last_try in false false false false false :; do
    cat >conf$$subs.sed <<_ACEOF
@@ -42,40 +54,28 @@
  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
+@@ -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
-@@ -13601,6 +13605,7 @@
+@@ -13666,6 +13670,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 @@
++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` = 12; then
-+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
+-  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
---- 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])

More information about the fedora-extras-commits mailing list