From afa94c192b9b3309f659a9bf710ecc12f9b86e105467c34443dca4fbbe45f686 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:53:20 +0000
Subject: [PATCH] - Use junit not junit4

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

diff --git a/apache-commons-io.changes b/apache-commons-io.changes
index 20f4dbf..cb40f47 100644
--- a/apache-commons-io.changes
+++ b/apache-commons-io.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  7 14:53:05 UTC 2014 - tchvatal@suse.com
+
+- Use junit not junit4
+
 -------------------------------------------------------------------
 Mon Sep  9 11:05:28 UTC 2013 - tchvatal@suse.com
 
diff --git a/apache-commons-io.spec b/apache-commons-io.spec
index 15acf65..853a8b3 100644
--- a/apache-commons-io.spec
+++ b/apache-commons-io.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-io
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,6 @@
 
 %define base_name       io
 %define short_name      commons-%{base_name}
-
 Name:           apache-commons-io
 Version:        2.4
 Release:        0
@@ -29,20 +28,17 @@ Url:            http://commons.apache.org/%{base_name}
 Source0:        http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 #PATCH-FIX-OPENSUSE: fix the version property to 2.4
 Patch0:         commons-io-version-property.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-
 BuildRequires:  ant >= 1.6
 BuildRequires:  java-devel >= 1.6.0
 BuildRequires:  javapackages-tools
-BuildRequires:  junit4
+BuildRequires:  junit
 BuildRequires:  unzip
-
 Requires:       javapackages-tools
-
 Provides:       %{short_name} = %{version}-%{release}
 Provides:       jakarta-%{short_name} = %{version}-%{release}
 Obsoletes:      jakarta-%{short_name} <= %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 Commons-IO contains utility classes, stream implementations,
@@ -63,7 +59,7 @@ This package contains the API documentation for %{name}.
 sed -i -e 's/.$//' *.txt
 
 %build
-export OPT_JAR_LIST="junit4"
+export OPT_JAR_LIST="junit"
 export CLASSPATH=
 CLASSPATH=target/classes:target/test-classes:$CLASSPATH
 ant -Dbuild.sysclasspath=only dist
@@ -85,9 +81,6 @@ install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt