From 3ef96bddf4436f29f5ca43e7ed7c8942a56976a648bd54cef5f089ae8ef50ce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 7 Jul 2014 14:43:43 +0000
Subject: [PATCH 1/3] - Depend on junit not junit4. Replace ant-trax with ant.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=17
---
 xmlunit.changes | 5 +++++
 xmlunit.spec    | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/xmlunit.changes b/xmlunit.changes
index b47addb..937d6d8 100644
--- a/xmlunit.changes
+++ b/xmlunit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/xmlunit.spec b/xmlunit.spec
index 0d791f7..2bbf58a 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -1,7 +1,7 @@
 #
 # 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.
 #
@@ -29,10 +29,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
@@ -70,7 +69,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

From 10b65b417cfe6a84ba1f681f92805f25e33c5c5b5f6a80890293351fd091b73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Tue, 8 Jul 2014 10:30:47 +0000
Subject: [PATCH 2/3] - Cleanup with spec-cleaner a bit.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=18
---
 xmlunit.changes | 5 +++++
 xmlunit.spec    | 7 ++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/xmlunit.changes b/xmlunit.changes
index 937d6d8..0be874d 100644
--- a/xmlunit.changes
+++ b/xmlunit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/xmlunit.spec b/xmlunit.spec
index 2bbf58a..bcd424e 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -3,7 +3,6 @@
 #
 # 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
@@ -40,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
-Requires(postun):  javapackages-tools
+BuildArch:      noarch
 
 %description
 XMLUnit extends JUnit to simplify unit testing of XML. It compares a control
@@ -61,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

From d9109404b8404f6ca242815c63cb53a19bd69fb625ff40abe486a27a159d1f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 11 Jul 2014 10:23:41 +0000
Subject: [PATCH 3/3] - Drop xmlunit1.0.zip as it is not used anywhere.

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlunit?expand=0&rev=19
---
 xmlunit.changes | 5 +++++
 xmlunit1.0.zip  | 3 ---
 2 files changed, 5 insertions(+), 3 deletions(-)
 delete mode 100644 xmlunit1.0.zip

diff --git a/xmlunit.changes b/xmlunit.changes
index 0be874d..c06a416 100644
--- a/xmlunit.changes
+++ b/xmlunit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+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
 
diff --git a/xmlunit1.0.zip b/xmlunit1.0.zip
deleted file mode 100644
index 633efc2..0000000
--- a/xmlunit1.0.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da85e544011fa0499b74ae9363a5130cc34c27a92349521bc4b6f25832ddee81
-size 421131