rpms/fop/devel fop.spec,1.4,1.5
Lillian Angel (langel)
fedora-extras-commits at redhat.com
Fri Dec 7 03:18:20 UTC 2007
Author: langel
Update of /cvs/pkgs/rpms/fop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27199
Modified Files:
fop.spec
Log Message:
* Thu Dec 6 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Removed ppc/64 conditions since IcedTea is now available for ppc/64.
Index: fop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fop/devel/fop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fop.spec 27 Nov 2007 21:20:49 -0000 1.4
+++ fop.spec 7 Dec 2007 03:17:46 -0000 1.5
@@ -23,13 +23,8 @@
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
@@ -56,11 +51,7 @@
%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
@@ -111,6 +102,9 @@
%changelog
+* Thu Dec 6 2007 Lillian Angel <langel at redhat.com> - 0.94-1
+- Removed ppc/64 conditions since IcedTea is now available for ppc/64.
+
* Tue Nov 27 2007 Lillian Angel <langel at redhat.com> - 0.94-1
- Fixed to build with gcj on ppc/64.
More information about the fedora-extras-commits
mailing list