From 01a1eaedcc76828f6942420f895db5f5d1d8c4ecb222d8402283585bc6707652 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 15:00:13 +0000
Subject: [PATCH] - Depend on junit not junit4

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

diff --git a/cal10n.changes b/cal10n.changes
index 4936c86..f968120 100644
--- a/cal10n.changes
+++ b/cal10n.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Jul  7 14:59:58 UTC 2014 - tchvatal@suse.com
+
+- Depend on junit not junit4
+
 -------------------------------------------------------------------
 Mon Sep  9 11:05:36 UTC 2013 - tchvatal@suse.com
 
diff --git a/cal10n.spec b/cal10n.spec
index 2e0e972..b240103 100644
--- a/cal10n.spec
+++ b/cal10n.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package cal10n
 #
-# 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
@@ -22,34 +22,27 @@ Release:        0
 Summary:        Compiler assisted localization library (CAL10N)
 License:        MIT
 Group:          Development/Libraries/Java
-
 Url:            http://cal10n.qos.ch
 Source0:        http://cal10n.qos.ch/dist/cal10n-%{version}.tar.gz
 Source1:        build.xml.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
-BuildArch:      noarch
-
 BuildRequires:  ant
 BuildRequires:  java-devel
-BuildRequires:  junit4
-
+BuildRequires:  junit
 Requires:       java
-Requires(post):   javapackages-tools
-Requires(postun): javapackages-tools
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
-Compiler Assisted Localization, abbreviated as CAL10N (pronounced as "calion") 
+Compiler Assisted Localization, abbreviated as CAL10N (pronounced as "calion")
 is a java library for writing localized (internationalized) messages.
 Features:
     * java compiler verifies message keys used in source code
     * tooling to detect errors in message keys
-    * native2ascii tool made superfluous, as you can directly encode bundles 
+    * native2ascii tool made superfluous, as you can directly encode bundles
       in the most convenient charset, per locale.
     * good performance (300 nanoseconds per key look-up)
     * automatic reloading of resource bundles upon change
 
-
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
@@ -58,7 +51,7 @@ Group:          Development/Libraries/Java
 API documentation for %{name}.
 
 %prep
-%setup -q 
+%setup -q
 tar -xf %{SOURCE1}
 find . -name "*.jar" | xargs rm
 
@@ -79,11 +72,11 @@ for dir in cal10n-api
 do
   pushd $dir
   export CLASSPATH=$(build-classpath \
-                     junit4 \
+                     junit \
                      ):target/classes:target/test-classes
   ant -Dmaven.mode.offline=true package javadoc \
       -Dmaven.test.skip=true \
-      -lib /usr/share/java
+      -lib %{_datadir}/java
   popd
 done