rpm/apache-commons-cli
SHA256
1
0
Fork 0
forked from pool/apache-commons-cli
Code Pull Requests Activity

- Fix build with new javapackages-tools

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-cli?expand=0&rev=9
This commit is contained in:
Tomáš Chvátal 2017-05-19 08:40:31 +00:00 committed by Git OBS Bridge
parent e27b39286b
commit 9fb073a523
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apache-commons-cli.changes
View File

@ -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

19
apache-commons-cli.spec
View File

@ -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
Provides: apache-cli
Obsoletes: jakarta-%{short_name} < %{version}
Provides: apache-cli = %{version}
Provides: java(commons-cli:commons-cli) = %{version}
Obsoletes: apache-cli < 1.2
@ -51,7 +47,8 @@ command line arguments and options.
Summary: Javadoc for %{name}
Group: Development/Libraries/Java
Requires: javapackages-tools
Obsoletes: jakarta-%{short_name}-javadoc < 1.1-6
Provides: jakarta-%{short_name}-javadoc = %{version}
Obsoletes: jakarta-%{short_name}-javadoc < %{version}
%description javadoc
This package contains the API documentation for %{name}.
@ -90,7 +87,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)