Compare commits

...
Sign in to create a new pull request.

3 commits

Author SHA1 Message Date
Dr. Tilmann Bubeck
d761513450 Updated to xmlunit-1.5 2013-10-17 21:11:12 +02:00
Dr. Tilmann Bubeck
d1f9be3f8b Added missing source 2013-10-12 16:06:32 +02:00
Dr. Tilmann Bubeck
343559275c Update to upstream's version 1.5 2013-10-12 16:01:40 +02:00
3 changed files with 21 additions and 7 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
xmlunit1.0.zip
xmlunit-1.3-src.zip
/xmlunit-1.4-src.zip
/xmlunit-1.5-src.zip

View file

@ -1 +1 @@
0b99949d5c8eb769da8123496aa02418 xmlunit-1.4-src.zip
ab042764ea846f7299ec664b84b39dbe xmlunit-1.5-src.zip

View file

@ -29,12 +29,12 @@
#
Name: xmlunit
Version: 1.4
Release: 2%{?dist}
Version: 1.5
Release: 1%{?dist}
Epoch: 0
Summary: Provides classes to do asserts on xml
License: BSD
Source0: http://downloads.sourceforge.net/project/xmlunit/xmlunit%20for%20Java/XMLUnit%20for%20Java%201.4/xmlunit-1.4-src.zip
Source0: http://downloads.sourceforge.net/xmlunit/xmlunit-1.5-src.zip
Source1: http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom
URL: http://xmlunit.sourceforge.net/
BuildRequires: jpackage-utils
@ -67,13 +67,14 @@ Javadoc for %{name}
%prep
%setup -q
sed -i /java.class.path/d build.xml
# remove all binary libs and javadocs
find . -name "*.jar" -exec rm -f {} \;
rm -rf doc
cat >build.properties <<EOF
junit.lib=$(build-classpath junit)
xmlxsl.lib=$(build-classpath xalan-j2 xalan-j2-serializer xerces-j2)
xmlxsl.lib=
test.report.dir=test
EOF
@ -85,8 +86,7 @@ EOF
sed -i 's/\r//g' README.txt LICENSE.txt
%build
export CLASSPATH=$(build-classpath xalan-j2-serializer)
ant -Dbuild.compiler=modern -Dfailonerror=false jar javadocs
ant -Dbuild.compiler=modern -Dhaltonfailure=yes jar javadocs
%install
@ -105,6 +105,9 @@ install -m 644 %{SOURCE1} \
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
cp -pr build/doc/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%check
ant
%pretrans javadoc -p <lua>
-- we changed symlink to dir in 1.4-2, workaround RPM issues
path = '%{_javadocdir}/%{name}'
@ -120,6 +123,16 @@ end
%doc %{_javadocdir}/%{name}
%changelog
* Fri Oct 11 2013 Dr. Tilmann Bubeck <tilmann@bubecks.de> - 0:1.5-1
- update to upstream's xmlunit-1.5
* Fri Sep 27 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.4-4
- Enable test suite
- Resolves: rhbz#987412
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Jun 12 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.4-2
- Update to latest packaging guidelines
- Cleanup BuildRequires