rpms/java-1.4.2-gcj-compat/devel bootstrap-temp.patch, 1.1, 1.2 java-1.4.2-gcj-compat.spec, 1.75, 1.76

[fedora-cvs-commits at redhat.com]

Author: gbenson

Update of /cvs/dist/rpms/java-1.4.2-gcj-compat/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29125

Modified Files:
	bootstrap-temp.patch java-1.4.2-gcj-compat.spec 
Log Message:
Bootstrapping take 3

bootstrap-temp.patch:
 aot-compile-rpm.in |    4 +---
 1 files changed, 1 insertion(+), 3 deletions(-)

Index: bootstrap-temp.patch
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/bootstrap-temp.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bootstrap-temp.patch	7 Jul 2005 16:12:01 -0000	1.1
+++ bootstrap-temp.patch	7 Jul 2005 16:27:53 -0000	1.2
@@ -1,11 +1,13 @@
 --- java-gcj-compat-1.0.31/aot-compile-rpm.in~	2005-07-07 11:48:23.000000000 +0100
 +++ java-gcj-compat-1.0.31/aot-compile-rpm.in	2005-07-07 17:07:53.000000000 +0100
-@@ -136,7 +136,7 @@
+@@ -135,9 +135,7 @@
+             os.path.join(libdir, basename + ".so")])
  
  def split_jarfile(src, dir, split = 1500):
-     """In order to avoid #158308 we must split large jarfiles on PPC."""
+-    """In order to avoid #158308 we must split large jarfiles on PPC."""
 -    if os.environ.get("RPM_ARCH") != "ppc":
-+    if os.environ.get("RPM_ARCH") not in ("ppc", "ppc64"):
-         return [src.filename]
+-        return [src.filename]
++    """In order to avoid huge assembler files we split large jarfiles."""
      items = src.infolist()
      if len([i for i in items if i.filename.endswith(".class")]) < split:
+         return [src.filename]


Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/devel/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- java-1.4.2-gcj-compat.spec	7 Jul 2005 16:12:01 -0000	1.75
+++ java-1.4.2-gcj-compat.spec	7 Jul 2005 16:27:53 -0000	1.76
@@ -137,7 +137,7 @@
 mkdir tmp
 cp -a %{SOURCE2} tmp/eclipse-ecj.jar
 # close your eyes...
-RPM_BUILD_ROOT=tmp ./aot-compile-rpm
+RPM_BUILD_ROOT=tmp sh aot-compile-rpm
 mv tmp/eclipse-ecj.jar tmp/usr/lib/gcj/%{name}/* .
 # (you can open them again now)
 gcj $RPM_OPT_FLAGS \