From 566f410286df14ebb3851e39a7e2177425a454df Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Oct 01 2010 06:50:04 +0000 Subject: Update to 1.4. --- diff --git a/sources b/sources index 18f8c94..ce1b97e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4dcac6600df8282685be6972bf9b4de4 xmlgraphics-commons-1.3.1-src.tar.gz +d2b56a1671d2ca63480e38acd9629ea7 xmlgraphics-commons-1.4-src.tar.gz diff --git a/xmlgraphics-commons.spec b/xmlgraphics-commons.spec index 56fe573..940c0a6 100644 --- a/xmlgraphics-commons.spec +++ b/xmlgraphics-commons.spec @@ -1,5 +1,5 @@ Name: xmlgraphics-commons -Version: 1.3.1 +Version: 1.4 Release: 1 Epoch: 0 Summary: XML Graphics Commons @@ -12,15 +12,15 @@ Source0: http://apache.skknet.net/xmlgraphics/commons/source/%{name}-%{ve BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: java-1.6.0-openjdk-devel >= 1:1.6.0.0-0.7 +BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: ant >= 0:1.6 BuildRequires: ant-junit >= 0:1.6 BuildRequires: junit -BuildRequires: jakarta-commons-io >= 0:1.1 -BuildRequires: jakarta-commons-logging >= 0:1.0.4 -Requires: jakarta-commons-logging >= 0:1.0.4 -Requires: jakarta-commons-io >= 0:1.1 +BuildRequires: apache-commons-io >= 0:1.1 +BuildRequires: apache-commons-logging >= 0:1.0.4 +Requires: apache-commons-logging >= 0:1.0.4 +Requires: apache-commons-io >= 0:1.1 %description Apache XML Graphics Commons is a library that consists of @@ -34,6 +34,7 @@ PostScript files, and much more. %package javadoc Summary: Javadoc for %{name} Group: Documentation +Requires: jpackage-utils %description javadoc %{summary}. @@ -45,9 +46,7 @@ rm -f `find . -name "*.jar"` %build -export ANT_HOME=/usr/share/ant -export JAVA_HOME=/usr/lib/jvm/java-openjdk -export CLASSPATH=$CLASSPATH:/usr/share/java/commons-logging.jar +export CLASSPATH=$(build-classpath commons-logging) export OPT_JAR_LIST="ant/ant-junit junit" pushd lib ln -sf $(build-classpath commons-io) . @@ -77,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Oct 1 2010 Alexander Kurtakov 0:1.4-1 +- Updte to 1.4. + * Sat Jan 9 2010 Alexander Kurtakov 0:1.3.1-1 - Update to 1.3.1. - Fix Source0 url.