rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.122, 1.123

[fedora-cvs-commits at redhat.com]

Author: fitzsim

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

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_65rh
- Do not BuildRequires eclipse-ecj in bootstrap mode.
- Build BouncyCastle with bootstrap ecj script in bootstrap mode.




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.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- java-1.4.2-gcj-compat.spec	2 Feb 2006 19:28:51 -0000	1.122
+++ java-1.4.2-gcj-compat.spec	2 Feb 2006 19:55:48 -0000	1.123
@@ -21,7 +21,7 @@
 
 %define name		java-%{javaver}-%{origin}-compat
 %define version		%{javaver}.%{buildver}
-%define release 	40jpp_64rh
+%define release 	40jpp_65rh
 %define cname           java-%{javaver}-%{origin}
 %define bcarchivever	131
 
@@ -49,7 +49,9 @@
 BuildRoot:	%{_tmppath}/%{name}-buildroot
 BuildRequires:	jpackage-utils >= 0:1.5, sed
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
+%if ! %{bootstrap}
 BuildRequires:	eclipse-ecj
+%endif
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.0-5
@@ -131,17 +133,6 @@
   --with-security-directory=%{_sysconfdir}/java/security/security.d
 make
 
-gzip -dc %{SOURCE1} | tar -xf -
-# build bouncy castle provider
-pushd bcprov-jdk14-%{bcarchivever}/src
-  find -type d -name test | xargs rm -rf
-  ecj `find . -type f -name "*.java"`
-  jar2="bcprov-%{bcarchivever}.jar"
-  files="`find . -type f -name "*.class"`"
-  test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
-  test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
-popd
-
 %if %{custom}
 cp -a %{SOURCE2} eclipse-ecj-%{cname}.jar
 sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj-1
@@ -163,6 +154,21 @@
 sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj
 %endif
 
+gzip -dc %{SOURCE1} | tar -xf -
+# build bouncy castle provider
+pushd bcprov-jdk14-%{bcarchivever}/src
+  find -type d -name test | xargs rm -rf
+%if %{bootstrap}
+  sh ecj `find . -type f -name "*.java"`
+%else
+  ecj `find . -type f -name "*.java"`
+%endif
+  jar2="bcprov-%{bcarchivever}.jar"
+  files="`find . -type f -name "*.class"`"
+  test ! -d classes && mf="" || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
+  test -n "$mf" && fastjar cvfm $jar2 $mf $files || fastjar cvf $jar2 $files
+popd
+
 %install
 %if %{custom}
 export PATH=%{gcj_prefix}/bin:$PATH
@@ -547,6 +553,10 @@
 %defattr(-,root,root)
 
 %changelog
+* Thu Feb  2 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_65rh
+- Do not BuildRequires eclipse-ecj in bootstrap mode.
+- Build BouncyCastle with bootstrap ecj script in bootstrap mode.
+
 * Fri Jan 27 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_64rh
 - Import BouncyCastle 1.3.1.
 - Re-enable BouncyCastle provider.