Accepting request 496661 from Java:packages

- Fix build with new javapackages-tools

OBS-URL: https://build.opensuse.org/request/show/496661
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-cli?expand=0&rev=6

apache-commons-cli.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri May 19 08:41:33 UTC 2017 - tchvatal@suse.com
+
+- Fix build with new javapackages-tools
+
 -------------------------------------------------------------------
 Wed Mar 18 09:37:41 UTC 2015 - tchvatal@suse.com
 

apache-commons-cli.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-cli
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -18,8 +18,6 @@
 
 %global base_name       cli
 %global short_name      commons-%{base_name}
-%global with_maven 0
-
 Name:           apache-commons-cli
 Version:        1.2
 Release:        0
@@ -32,14 +30,12 @@ Source1:        build.xml.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 BuildRequires:  ant
+BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 Requires:       java >= 1.6.0
-Requires:       javapackages-tools
-Requires(post):   javapackages-tools
-Requires(postun): javapackages-tools
 Provides:       jakarta-%{short_name} = %{version}-%{release}
-Obsoletes:      jakarta-%{short_name} < 1.1-6
+Obsoletes:      jakarta-%{short_name} < %{version}
-Provides:       apache-cli
+Provides:       apache-cli = %{version}
 Provides:       java(commons-cli:commons-cli) = %{version}
 Obsoletes:      apache-cli < 1.2
 
@@ -50,8 +46,8 @@ command line arguments and options.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Libraries/Java
-Requires:       javapackages-tools
+Provides:       jakarta-%{short_name}-javadoc = %{version}
-Obsoletes:      jakarta-%{short_name}-javadoc < 1.1-6
+Obsoletes:      jakarta-%{short_name}-javadoc < %{version}
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -90,7 +86,11 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 %doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
+%if %{?suse_version} > 1320
 %{_datadir}/maven-metadata/%{name}.xml
+%else
+%config(noreplace) %{_mavendepmapfragdir}/%{name}
+%endif
 
 %files javadoc
 %defattr(-,root,root)