Accepting request 496507 from Java:packages

- Fix build with new javapackages-tools

OBS-URL: https://build.opensuse.org/request/show/496507
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-codec?expand=0&rev=14

apache-commons-codec.changes

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

apache-commons-codec.spec

@@ -1,9 +1,8 @@
 #
 # spec file for package apache-commons-codec
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2010, JPackage Project
-# All rights reserved.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,56 +17,32 @@
 #
 
 
-# % bcond_without maven
-
 %define base_name  codec
 %define short_name commons-%{base_name}
-
 Name:           apache-commons-codec
 Version:        1.10
 Release:        0
 Summary:        Apache Commons Codec Package
 License:        Apache-2.0
 Group:          Development/Libraries/Java
-
 Url:            http://commons.apache.org/codec/
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Source4:        MANIFEST.MF
-
 # PATCH-FIX-OPENSUSE Avoid spurious timeout in BeiderMorse tests
 Patch0:         timeout.patch
-
 BuildRequires:  ant >= 1.7
 BuildRequires:  ant-junit >= 1.7
+BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 # FIXME: mozilla-nss is necessary in order to use crypto, which is tested via junit tests
 #        this should be a dependency of openjdk itself
 BuildRequires:  junit
 BuildRequires:  mozilla-nss
-
-%if %with maven
-BuildRequires:  apache-commons-parent >= 12
-BuildRequires:  maven-surefire-maven-plugin
-BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven2 >= 2.0.8
-BuildRequires:  maven2-plugin-antrun
-BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-idea
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-resources
-%endif
-Requires(post): javapackages-tools
-Requires(postun): javapackages-tools
-
 Requires:       java >= 1.6.0
 Provides:       jakarta-%{short_name} = %{version}
 Obsoletes:      jakarta-%{short_name} < %{version}
 Provides:       %{short_name} = %{version}
 Obsoletes:      %{short_name} < %{version}
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
@@ -142,11 +117,7 @@ install -p -m 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
 
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
-%if %with maven
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%else
 cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
-%endif
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}-%{version}
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/jakarta-%{short_name}
 ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
@@ -156,7 +127,11 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
 %doc LICENSE.txt RELEASE-NOTES.txt
 %{_javadir}/*.jar
 %{_mavenpomdir}/*
-%{_datadir}/maven-metadata/%{name}.xml*
+%if %{?suse_version} > 1320
+%{_datadir}/maven-metadata/%{name}.xml
+%else
+%config(noreplace) %{_mavendepmapfragdir}/%{name}
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)