rpms/java-1.4.2-gcj-compat/devel java-1.4.2-gcj-compat.spec, 1.53, 1.54

[fedora-cvs-commits at redhat.com]

Author: overholt

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

Modified Files:
	java-1.4.2-gcj-compat.spec 
Log Message:
* Wed May 11 2005 Andrew Overholt <overholt at redhat.com>
- Add machinery to allow for use with non-system gcc installations.



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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- java-1.4.2-gcj-compat.spec	15 Apr 2005 21:19:27 -0000	1.53
+++ java-1.4.2-gcj-compat.spec	11 May 2005 20:54:50 -0000	1.54
@@ -1,7 +1,9 @@
 %define section		free
 
+%{!?custom:	%define custom 0}
+%{!?gcjprefix: 	%define gcjprefix %{nil}}
+%{!?origin:	%{expand: %%define origin gcj%{gccsuffix}}}
 %define gccsuffix	%{nil}
-%define	origin		gcj%{gccsuffix}
 %define priority	1420
 %define	javaver		1.4.2
 %define buildver	0
@@ -89,8 +91,14 @@
 %setup -q -n java-gcj-compat-%{jgcver}
 
 %build
+%if %{custom}
+export PATH=%{gcj_prefix}/bin:$PATH
+%endif
 %configure --disable-symlinks --with-arch-directory=%{_arch} \
   --with-os-directory=linux \
+%if %{custom}
+  --with-origin-name=%{origin} \
+%endif
   --with-classpath-security=%{_prefix}/lib/security/classpath.security \
   --with-security-directory=%{_sysconfdir}/java/security/security.d
 make
@@ -354,6 +362,9 @@
 %defattr(-,root,root)
 
 %changelog
+* Wed May 11 2005 Andrew Overholt <overholt at redhat.com>
+- Add machinery to allow for use with non-system gcc installations.
+
 * Fri Apr 15 2005 Thomas Fitzsimmons <fitzsim at redhat.com> - 0:1.4.2.0-40jpp_18rh
 - Require gnu-crypto.