rpms/java-1.6.0-openjdk/devel java-1.6.0-openjdk-makefile.patch, 1.7, 1.8

[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-serv2737

Modified Files:
	java-1.6.0-openjdk-makefile.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- java-1.6.0-openjdk-makefile.patch	5 Aug 2008 14:20:12 -0000	1.7
+++ java-1.6.0-openjdk-makefile.patch	5 Aug 2008 14:45:33 -0000	1.8
@@ -1,14 +1,14 @@
---- oldMakefile.am	2008-07-16 10:09:49.000000000 -0400
-+++ Makefile.am	2008-07-16 11:23:36.000000000 -0400
-@@ -436,7 +436,6 @@
+--- makeam	2008-08-05 10:44:07.000000000 -0400
++++ Makefile.am	2008-08-05 10:44:39.000000000 -0400
+@@ -515,7 +515,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
  if WITH_CACAO
  if !USE_SYSTEM_CACAO
-@@ -458,7 +457,7 @@
+@@ -549,7 +548,7 @@
  clean-extract:
  	rm -f stamps/extract.stamp
  
@@ -17,17 +17,9 @@
  	mkdir -p stamps ; \
  	rm -f stamps/patch.stamp.tmp ; \
  	touch stamps/patch.stamp.tmp ; \
---- 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@
-@@ -963,7 +964,6 @@
+--- 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 ; \
@@ -35,7 +27,7 @@
  	fi
  @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	if ! test -d cacao ; \
  @USE_SYSTEM_CACAO_FALSE@@WITH_CACAO_TRUE@	then \
-@@ -991,7 +991,7 @@
+@@ -991,7 +990,7 @@
  clean-extract:
  	rm -f stamps/extract.stamp