rpms/fop/devel fop.spec,1.3,1.4

Lillian Angel (langel) fedora-extras-commits at redhat.com
Tue Nov 27 21:21:21 UTC 2007


Author: langel

Update of /cvs/pkgs/rpms/fop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24319

Modified Files:
	fop.spec 
Log Message:
* Tue Nov 27 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Fixed to build with gcj on ppc/64.




Index: fop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fop/devel/fop.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fop.spec	27 Nov 2007 20:57:09 -0000	1.3
+++ fop.spec	27 Nov 2007 21:20:49 -0000	1.4
@@ -23,8 +23,13 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ant
 BuildRequires:  ant-trax
+%ifnarch ppc ppc64
 BuildRequires:  java-1.7.0-icedtea-devel
 BuildRequires:  java-1.7.0-icedtea-javadoc
+%else
+BuildRequires:  java-1.5.0-gcj-devel
+BuildRequires:  java-1.5.0-gcj-javadoc
+%endif
 BuildArch:      noarch
 
 %description
@@ -51,7 +56,11 @@
 
 %build
 export ANT_HOME=/usr/share/ant
+%ifnarch ppc ppc64
 export JAVA_HOME=/usr/lib/jvm/java-icedtea
+%else
+export JAVA_HOME=/usr/lib/jvm/java-gcj
+%endif
 export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax-1.7.0.jar
 ant clean jar-main transcoder-pkg javadocs
 
@@ -102,6 +111,9 @@
 
 
 %changelog
+* Tue Nov 27 2007 Lillian Angel <langel at redhat.com> - 0.94-1
+- Fixed to build with gcj on ppc/64.
+
 * Fri Nov 23 2007 Lillian Angel <langel at redhat.com> - 0.94-1
 - Fixed rpmlint errors.
 




More information about the fedora-extras-commits mailing list