From d0c174ccce064031cc28d3234bb55fb8ea5642bd5fc0e1f7cbf498a1103a9984 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 18 Mar 2015 10:07:47 +0000
Subject: [PATCH] new jpackage-tools

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

diff --git a/junit.changes b/junit.changes
index 86508c2..5ff4b4a 100644
--- a/junit.changes
+++ b/junit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 18 09:46:15 UTC 2015 - tchvatal@suse.com
+
+- Fix build with new javapackages-tools
+
 -------------------------------------------------------------------
 Fri Oct 25 07:39:22 UTC 2013 - mvyskocil@suse.com
 
diff --git a/junit.spec b/junit.spec
index bdb4568..c98a9be 100644
--- a/junit.spec
+++ b/junit.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package junit
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,30 +26,26 @@ Url:            http://www.junit.org/
 Source0:        https://github.com/junit-team/junit/archive/r%{version}.tar.gz
 #Source1:        http://search.maven.org/remotecontent?filepath=junit/junit/4.11/junit-4.11.pom
 Source1:        junit-4.11.pom
-
 #PATCH-FIX-OPENSUSE: do not use bundled hamcrest sources, which btw fixes hamcrest build with junit4
 Patch0:         junit-no-hamcrest-src.patch
-
-BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
 BuildRequires:  ant
 BuildRequires:  hamcrest >= 1.3
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  javapackages-tools
 BuildRequires:  perl(Digest::MD5)
-
-Requires(post): javapackages-tools
-Requires(postun): javapackages-tools
 Requires:       hamcrest
 Requires:       java >= 1.6.0
+Requires(post): javapackages-tools
+Requires(postun): javapackages-tools
 Provides:       junit4 = %{version}
 Obsoletes:      junit4 <= 4.10
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
-JUnit is a regression testing framework written by Erich Gamma and Kent Beck. 
+JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
 It is used by the developer who implements unit tests in Java. JUnit is Open
-Source Software, released under the Common Public License Version 1.0 and 
+Source Software, released under the Common Public License Version 1.0 and
 hosted on GitHub.
 
 %package manual
@@ -111,7 +107,7 @@ install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr junit%{version}/javadoc/* %{buildroot}%{_javadocdir}/%{name}
 
 # demo
-install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is 
+install -d -m 755 %{buildroot}%{_datadir}/%{name}/demo/junit # Not using % name for last part because it is
                                                                 # part of package name
 cp -pr junit%{version}/junit/* %{buildroot}%{_datadir}/%{name}/demo/junit
 
@@ -136,7 +132,7 @@ java -cp %{buildroot}/%{_javadir}/%{name}.jar: test  && exit 42
 %{_javadir}/%{name}.jar
 %{_javadir}/junit4.jar
 %{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%{_datadir}/maven-metadata/%{name}.xml*
 
 %files demo
 %defattr(0644,root,root,0755)