From 1f32cd338cd69ffb23ce7add6906e2ea465dc900 Mon Sep 17 00:00:00 2001 From: Ruediger Landmann Date: Feb 15 2011 05:06:30 +0000 Subject: Add BR: zip for F15 --- diff --git a/fop.spec b/fop.spec index be828bd..7e2410e 100644 --- a/fop.spec +++ b/fop.spec @@ -1,7 +1,7 @@ Summary: XSL-driven print formatter Name: fop Version: 0.95 -Release: 5%{?dist} +Release: 6%{?dist} License: ASL 2.0 Group: Applications/Text Source0: http://www.apache.org/dist/xmlgraphics/fop/source/%{name}-%{version}-src.tar.gz @@ -25,10 +25,10 @@ Requires(post): jpackage-utils Requires(postun): jpackage-utils BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: ant BuildRequires: ant-trax BuildRequires: java-1.6.0-openjdk-devel BuildRequires: java-1.6.0-openjdk-javadoc +BuildRequires: zip BuildArch: noarch %description @@ -53,13 +53,7 @@ Javadoc for %{name}. %patch1 -p0 %build -export ANT_HOME=/usr/share/ant -export JAVA_HOME=/usr/lib/jvm/java-openjdk -export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax-1.7.0.jar -export CLASSPATH=$CLASSPATH:/usr/share/java/xmlgraphics-commons.jar -export CLASSPATH=$CLASSPATH:/usr/share/java/batik-all.jar -export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis.jar -export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis-ext.jar +export CLASSPATH=$(xmlgraphics-commons batik-all xml-commons-apis xml-commons-apis-ext) ant clean jar-main transcoder-pkg javadocs %install @@ -122,6 +116,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 15 2011 RĂ¼diger Landmann - 0.95-6 +- Add BR:zip for F15 + * Thu Mar 25 2010 Mary Ellen Foster - 0.95-5 - Add maven depmap fragment - Add dist to version