- BR/R java 1.6.0 not java-openjdk.

- Cleanup build section.
This commit is contained in:
Alexander Kurtakov 2010-10-01 08:19:38 +03:00
parent 49d777fdf9
commit 13bb071d5c

View File

@ -1,11 +1,11 @@
Name: batik
Version: 1.7
Release: 6%{?dist}
Release: 7%{?dist}
Summary: Scalable Vector Graphics for Java
License: ASL 2.0
URL: http://xml.apache.org/batik/
Group: Applications/Multimedia
#Source0: http://apache.crihan.fr/dist/xmlgraphics/batik/batik-src-%{version}.zip
#Source0: http://apache.crihan.fr/dist/xmlgraphics/batik/batik-src-%%{version}.zip
Source0: %{name}-repack-%{version}.zip
Source1: %{name}.squiggle.script
Source2: %{name}.svgpp.script
@ -20,12 +20,12 @@ Patch1: %{name}-policy.patch
Requires: rhino >= 1.5
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildArch: noarch
BuildRequires: java-1.6.0-openjdk-devel >= 1:1.6.0.0
BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jpackage-utils >= 1.5
BuildRequires: ant
BuildRequires: ant-trax
BuildRequires: ant-nodeps
BuildRequires: subversion
BuildRequires: jython
@ -34,10 +34,10 @@ BuildRequires: jpackage-utils >= 1.5
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis >= 1.3.04
BuildRequires: java-1.6.0-openjdk-javadoc
BuildRequires: java-javadoc >= 1:1.6.0
BuildRequires: rhino-javadoc
Requires: java-1.6.0-openjdk >= 1:1.6.0.0
Requires: java >= 1:1.6.0
Requires: rhino >= 1.5
Requires: xml-commons-apis >= 1.3.04
@ -120,6 +120,10 @@ Demonstrations and samples for %{name}.
%prep
%setup -q -n %{name}-%{version}
find -name '*.class' -exec rm -f '{}' \;
find -name '*.jar' -exec rm -f '{}' \;
%patch0 -p1
%patch1 -p1
rm -f `find -name readOnly.png`
@ -131,15 +135,9 @@ popd
%build
export CLASSPATH=$CLASSPATH:/usr/share/java/ant/ant-trax.jar
export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis.jar
export CLASSPATH=$CLASSPATH:/usr/share/java/xml-commons-apis-ext.jar
export CLASSPATH=$CLASSPATH:/usr/share/java/js.jar
export CLASSPATH=$CLASSPATH:/usr/share/java/rhino.jar
export CLASSPATH=$CLASSPATH:/usr/share/java/xalan-j2.jar
export CLASSPATH=$CLASSPATH:/usr/share/java/xerces-j2.jar
export CLASSPATH=$(build-classpath xml-commons-apis xml-commons-apis-ext js rhino xalan-j2 xerces-j2)
ant all-jar jars\
-Ddebug=on \
-Ddebug=on \
-Dsun-codecs.present=false \
-Dsun-codecs.disabled=true \
svg-pp-jar \
@ -223,7 +221,7 @@ pushd $RPM_BUILD_ROOT%{_javadir}
done
popd
pushd $RPM_BUILD_ROOT%{_javadir}/batik
for jar in *-%{version}*.jar; do
for jar in *-%{version}*.jar; do
ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`;
done
popd
@ -299,6 +297,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Fri Oct 1 2010 Alexander Kurtakov <akurtako@redhat.com> 1.7-7
- BR/R java 1.6.0 not java-openjdk.
- Cleanup build section.
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild