rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-makefile.patch, 1.4, 1.5

[Lillian Angel (langel)]

Author: langel

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

Added Files:
	java-1.6.0-openjdk-makefile.patch 
Log Message:
Added new patch



java-1.6.0-openjdk-makefile.patch:

Index: java-1.6.0-openjdk-makefile.patch
===================================================================
RCS file: java-1.6.0-openjdk-makefile.patch
diff -N java-1.6.0-openjdk-makefile.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ java-1.6.0-openjdk-makefile.patch	15 Jul 2008 17:08:51 -0000	1.5
@@ -0,0 +1,46 @@
+--- oldMakefile.am	2008-07-15 11:28:34.000000000 -0400
++++ Makefile.am	2008-07-15 12:50:40.000000000 -0400
+@@ -444,7 +444,6 @@
+ 	  mkdir openjdk ; \
+ 	  $(TAR) xzf $(OPENJDK_SRC_ZIP) -C openjdk; \
+ 	  chmod -R ug+w openjdk ; \
+-	  sh $(srcdir)/fsg.sh ; \
+ 	fi
+ if WITH_CACAO
+ if !USE_SYSTEM_CACAO
+@@ -466,7 +465,7 @@
+ clean-extract:
+ 	rm -f stamps/extract.stamp
+ 
+-stamps/patch.stamp: stamps/patch-fsg.stamp
++stamps/patch.stamp: stamps/extract.stamp
+ 	rm -f stamps/patch.stamp.tmp
+ 	mkdir -p stamps ; \
+ 	all_patches_ok=yes; \
+--- oldMakefile.in	2008-07-15 11:29:18.000000000 -0400
++++ Makefile.in	2008-07-15 12:50:52.000000000 -0400
+@@ -91,6 +91,7 @@
+ ALSA_LIBS = @ALSA_LIBS@
+ ALT_CACAO_SRC_ZIP = @ALT_CACAO_SRC_ZIP@
+ ALT_OPENJDK_SRC_ZIP = @ALT_OPENJDK_SRC_ZIP@
++ALT_OPT_CFLAGS = @ALT_OPT_CFLAGS@
+ AMTAR = @AMTAR@
+ ANT = @ANT@
+ AUTOCONF = @AUTOCONF@
+@@ -921,7 +922,6 @@
+ 	  mkdir openjdk ; \
+ 	  $(TAR) xzf $(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 \
+@@ -939,7 +939,7 @@
+ clean-extract:
+ 	rm -f stamps/extract.stamp
+ 
+-stamps/patch.stamp: stamps/patch-fsg.stamp
++stamps/patch.stamp: stamps/extract.stamp
+ 	rm -f stamps/patch.stamp.tmp
+ 	mkdir -p stamps ; \
+ 	all_patches_ok=yes; \