rpms/java-1.4.2-gcj-compat/FC-5 java-1.4.2-gcj-compat.spec, 1.147, 1.148

[fedora-cvs-commits at redhat.com]

Author: fitzsim

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

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
- Add eclipse-ecj build requires on non-bootstrap architectures.
- Remove ifnarch ia64 sections.




Index: java-1.4.2-gcj-compat.spec
===================================================================
RCS file: /cvs/dist/rpms/java-1.4.2-gcj-compat/FC-5/java-1.4.2-gcj-compat.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- java-1.4.2-gcj-compat.spec	26 Jul 2006 21:11:13 -0000	1.147
+++ java-1.4.2-gcj-compat.spec	26 Jul 2006 21:48:28 -0000	1.148
@@ -1,6 +1,6 @@
 %define section		free
 
-%ifarch %{ix86} x86_64 ppc
+%ifarch %{ix86} x86_64 ppc ia64
 %define bootstrap	0
 %else
 %define bootstrap	1
@@ -53,6 +53,10 @@
 BuildRequires:	gcc%{gccsuffix}-java >= %{gccver}
 BuildRequires:	gjdoc
 BuildRequires:	libgcj%{gccsuffix}-src >= %{gccver}
+BuildRequires:	libgcj%{gccsuffix} >= %{gccver}
+%if ! %{bootstrap}
+BuildRequires:	eclipse-ecj
+%endif
 Requires:	libgcj%{gccsuffix} >= %{gccver}
 Requires:	gjdoc
 Requires:	jessie >= 1.0.1
@@ -161,13 +165,11 @@
 %if %{bootstrap}
 mkdir tmp
 cp -a %{SOURCE2} eclipse-ecj.jar
-%ifnarch ia64
 mv eclipse-ecj.jar tmp
 # close your eyes...
 RPM_BUILD_ROOT=tmp python aot-compile-rpm
 mv tmp/eclipse-ecj.jar tmp%{_libdir}/gcj/%{name}/* .
 # (you can open them again now)
-%endif
 sed 's:@JAVADIR@:%{_javadir}:g' < %{SOURCE3} > ecj
 %endif
 
@@ -290,7 +292,6 @@
 %if %{bootstrap}
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 install -m644 eclipse-ecj.jar $RPM_BUILD_ROOT%{_javadir}
-%ifnarch ia64
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
 install -m755 eclipse-ecj.jar.so $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
 install -m644 eclipse-ecj.jar.db $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
@@ -627,9 +628,7 @@
 %endif
 %if %{bootstrap}
 %{_bindir}/ecj
-%ifnarch ia64
 %{_libdir}/gcj/%{name}
-%endif
 %{_javadir}/eclipse-ecj.jar
 %endif
 
@@ -644,6 +643,8 @@
 
 %changelog
 * Wed Jul 26 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh.1
+- Add eclipse-ecj build requires on non-bootstrap architectures.
+- Remove ifnarch ia64 sections.
 - Fix BouncyCastle bug. (200196)
 
 * Fri Mar  3 2006 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_83rh