Accepting request 240419 from Java:packages

- Drop xmlunit1.0.zip as it is not used anywhere.

- Cleanup with spec-cleaner a bit.

- Depend on junit not junit4. Replace ant-trax with ant.

OBS-URL: https://build.opensuse.org/request/show/240419
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xmlunit?expand=0&rev=11

xmlunit.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Fri Jul 11 10:23:19 UTC 2014 - tchvatal@suse.com
+
+- Drop xmlunit1.0.zip as it is not used anywhere.
+
+-------------------------------------------------------------------
+Tue Jul  8 10:30:25 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner a bit.
+
+-------------------------------------------------------------------
+Mon Jul  7 14:43:20 UTC 2014 - tchvatal@suse.com
+
+- Depend on junit not junit4. Replace ant-trax with ant.
+
 -------------------------------------------------------------------
 Tue Oct  8 07:40:00 UTC 2013 - mvyskocil@suse.com
 

xmlunit.spec

@@ -1,9 +1,8 @@
 #
 # spec file for package xmlunit
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
-# All rights reserved.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -29,10 +28,9 @@ Source0:        http://download.sourceforge.net/%{name}/%{name}-%{version}-src.z
 Source1:        http://repo1.maven.org/maven2/%{name}/%{name}/%{version}/%{name}-%{version}.pom
 BuildRequires:  ant
 BuildRequires:  ant-junit
-BuildRequires:  ant-trax
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
-BuildRequires:  junit4
+BuildRequires:  junit
 BuildRequires:  unzip
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
@@ -41,10 +39,8 @@ Requires:       junit
 Requires:       xalan-j2
 Requires:       xerces-j2
 Requires:       xml-commons-jaxp-1.3-apis
-BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires(post):    javapackages-tools
+BuildArch:      noarch
-Requires(postun):  javapackages-tools
 
 %description
 XMLUnit extends JUnit to simplify unit testing of XML. It compares a control
@@ -62,7 +58,7 @@ Javadoc for %{name}. Also contains userguide.
 %prep
 %setup -q
 
-%{__perl} -pi -e 's/\r$//g' README.txt LICENSE.txt
+perl -pi -e 's/\r$//g' README.txt LICENSE.txt
 
 # remove all binary libs and javadocs
 find . -name "*.jar" -delete
@@ -70,7 +66,7 @@ find . -name "*.jar" -delete
 %build
 
 cat > build.properties << EOF
-junit.lib=$(build-classpath junit4)
+junit.lib=$(build-classpath junit)
 xmlxsl.lib=$(build-classpath xalan-j2 xerces-j2 xml-commons-jaxp-1.3-apis)
 test.report.dir=test
 EOF

xmlunit1.0.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da85e544011fa0499b74ae9363a5130cc34c27a92349521bc4b6f25832ddee81
-size 421131