From 2ccfa744494c46bad832efec46cbf9cf4cb294b085b06f579d6a447d738ca31e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tomas.chvatal@gmail.com>
Date: Mon, 9 Sep 2013 12:02:32 +0000
Subject: [PATCH 1/2] Replace jpackage-utils by javapackages-tools

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

diff --git a/xmlunit.changes b/xmlunit.changes
index 7b5bce4..00df69b 100644
--- a/xmlunit.changes
+++ b/xmlunit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Sep  9 11:06:30 UTC 2013 - tchvatal@suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
 -------------------------------------------------------------------
 Thu Dec 15 11:29:10 UTC 2011 - mvyskocil@suse.cz
 
diff --git a/xmlunit.spec b/xmlunit.spec
index d5b6c2c..7c27bfa 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package xmlunit
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
 # All rights reserved.
 #
@@ -35,7 +35,7 @@ BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  ant-trax
 BuildRequires:  java-devel
-BuildRequires:  jpackage-utils
+BuildRequires:  javapackages-tools
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-jaxp-1.3-apis
@@ -44,12 +44,12 @@ BuildRequires:  unzip
 %endif
 Requires:       junit
 Requires:       xalan-j2
-Requires:       xml-commons-jaxp-1.3-apis
 Requires:       xerces-j2
+Requires:       xml-commons-jaxp-1.3-apis
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Requires(post):    jpackage-utils >= 1.7.3
-Requires(postun):  jpackage-utils >= 1.7.3
+Requires(post):    javapackages-tools
+Requires(postun):  javapackages-tools
 
 %description
 XMLUnit extends JUnit to simplify unit testing of XML. It compares a control

From 5540bf99db65bc4fba393dd92bf8978e849228ab0aaf37e5499bf9b0a925a046 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Wed, 11 Sep 2013 10:04:06 +0000
Subject: [PATCH 2/2] - use add_maven_depmap from javapackages-tools

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

diff --git a/xmlunit.changes b/xmlunit.changes
index 00df69b..2688040 100644
--- a/xmlunit.changes
+++ b/xmlunit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Sep 11 10:03:55 UTC 2013 - mvyskocil@suse.com
+
+- use add_maven_depmap from javapackages-tools
+
 -------------------------------------------------------------------
 Mon Sep  9 11:06:30 UTC 2013 - tchvatal@suse.com
 
diff --git a/xmlunit.spec b/xmlunit.spec
index 7c27bfa..cf44fdc 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -18,8 +18,6 @@
 #
 
 
-%define section free
-
 Name:           xmlunit
 Version:        1.0
 Release:        0
@@ -36,12 +34,11 @@ BuildRequires:  ant-junit
 BuildRequires:  ant-trax
 BuildRequires:  java-devel
 BuildRequires:  javapackages-tools
+BuildRequires:  junit
+BuildRequires:  unzip
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-jaxp-1.3-apis
-%if %defined suse_version
-BuildRequires:  unzip
-%endif
 Requires:       junit
 Requires:       xalan-j2
 Requires:       xerces-j2
@@ -84,48 +81,31 @@ EOF
 %build
 export CLASSPATH=
 export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 jar test docs
+ant jar test docs
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
-install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
-
-# Jar versioning
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
+install -m 0644 lib/%{name}%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
 # poms
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
-
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
 install -m 644 %{SOURCE1} \
-    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+    $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap
 
 # Javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr doc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
 %doc README.txt LICENSE.txt XMLUnit.pdf example.html
 %{_javadir}/*
-%{_datadir}/maven2/poms/*
+%{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog