From 10d727836aab7f9a0913198bd3acba79840aa21a Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de>
Date: Sat, 12 Oct 2013 15:07:51 +0200
Subject: [PATCH 1/8] Update to upstream's version 1.5

---
 xmlunit.spec | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/xmlunit.spec b/xmlunit.spec
index 7e53e82..b757674 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -29,12 +29,12 @@
 #
 
 Name:           xmlunit
-Version:        1.4
-Release:        3%{?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,13 @@ 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
 

From 57330717f0c8cf111b29380eb8d2672926c1f4fb Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de>
Date: Sat, 12 Oct 2013 15:38:47 +0200
Subject: [PATCH 2/8] Missing sources added


From 948cbc1ab292f35fda53834e3d7e269bef6bc43a Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de>
Date: Sat, 12 Oct 2013 15:39:42 +0200
Subject: [PATCH 3/8] Missing sources added


From f20611c6f51b16dc057fcb3454896710576d5c11 Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de>
Date: Sat, 12 Oct 2013 15:40:31 +0200
Subject: [PATCH 4/8] Added missing sources


From 0ebe2d40b58571b1a2e1534878b1997a20b27b85 Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de>
Date: Sat, 12 Oct 2013 15:42:09 +0200
Subject: [PATCH 5/8] Added missing sources


From 8332b89296118c99a8e58bb5fdec1447b0609aad Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de>
Date: Sat, 12 Oct 2013 15:43:10 +0200
Subject: [PATCH 6/8] Added missing sources


From ab2a3a585c60c75263ddf9af48d6e866a0e1de01 Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <t.bubeck@reinform.de>
Date: Sat, 12 Oct 2013 15:50:16 +0200
Subject: [PATCH 7/8] Added missing sources

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 344e157..eecdd61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 xmlunit1.0.zip
 xmlunit-1.3-src.zip
 /xmlunit-1.4-src.zip
+/xmlunit-1.5-src.zip
diff --git a/sources b/sources
index c91eed5..47ce33b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0b99949d5c8eb769da8123496aa02418  xmlunit-1.4-src.zip
+ab042764ea846f7299ec664b84b39dbe  xmlunit-1.5-src.zip

From d4370cb4792a0309d7d5abe37a7c2a9b116a3a23 Mon Sep 17 00:00:00 2001
From: "Dr. Tilmann Bubeck" <tilmann@bubecks.de>
Date: Sun, 4 Jan 2015 15:05:14 +0100
Subject: [PATCH 8/8] update to upstream's xmlunit-1.6

---
 .gitignore   | 1 +
 sources      | 2 +-
 xmlunit.spec | 7 +++++--
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index eecdd61..f129c9f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ xmlunit1.0.zip
 xmlunit-1.3-src.zip
 /xmlunit-1.4-src.zip
 /xmlunit-1.5-src.zip
+/xmlunit-1.6-src.zip
diff --git a/sources b/sources
index 47ce33b..d4e13e8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ab042764ea846f7299ec664b84b39dbe  xmlunit-1.5-src.zip
+e69b85b1b386b5027e30053eaaf591a3  xmlunit-1.6-src.zip
diff --git a/xmlunit.spec b/xmlunit.spec
index b757674..2a791a7 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -29,12 +29,12 @@
 #
 
 Name:           xmlunit
-Version:        1.5
+Version:        1.6
 Release:        1%{?dist}
 Epoch:          0
 Summary:        Provides classes to do asserts on xml
 License:        BSD
-Source0:        http://downloads.sourceforge.net/xmlunit/xmlunit-1.5-src.zip
+Source0:        http://downloads.sourceforge.net/xmlunit/xmlunit-1.6-src.zip
 Source1:        http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom
 URL:            http://xmlunit.sourceforge.net/
 BuildRequires:  jpackage-utils
@@ -123,6 +123,9 @@ end
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sun Jan 04 2015 Dr. Tilmann Bubeck <tilmann@bubecks.de> - 0:1.6-1
+- update to upstream's xmlunit-1.6
+
 * Fri Oct 11 2013 Dr. Tilmann Bubeck <tilmann@bubecks.de> - 0:1.5-1
 - update to upstream's xmlunit-1.5