From e455110afc9fa31de82a311beea3a3b35094654f7e0eb2879c2e36c0a8326b0a Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 12 Feb 2021 12:57:36 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-cli?expand=0&rev=30 --- apache-commons-cli.changes | 6 ++++++ apache-commons-cli.spec | 14 ++++++-------- build.xml.tar.bz2 | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/apache-commons-cli.changes b/apache-commons-cli.changes index d62fd26..eb99ea9 100644 --- a/apache-commons-cli.changes +++ b/apache-commons-cli.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 12 12:54:07 UTC 2021 - Fridrich Strba + +- Add OSGi manifest to the build files. +- Set java source/target levels to 6 + ------------------------------------------------------------------- Mon Mar 25 17:19:16 UTC 2019 - Fridrich Strba diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 0b25b15..e5004cf 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-cli # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,13 +30,11 @@ Source1: build.xml.tar.bz2 Patch0: CLI-253-workaround.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -Requires: java >= 1.8 Provides: jakarta-%{short_name} = %{version}-%{release} -Obsoletes: jakarta-%{short_name} < %{version} -Provides: apache-cli = %{version} -Obsoletes: apache-cli < %{version} +Obsoletes: jakarta-%{short_name} < %{version}-%{release} +Provides: apache-cli = %{version}-%{release} +Obsoletes: apache-cli < %{version}-%{release} BuildArch: noarch %description @@ -46,8 +44,8 @@ command line arguments and options. %package javadoc Summary: Javadoc for %{name} Group: Documentation/HTML -Provides: jakarta-%{short_name}-javadoc = %{version} -Obsoletes: jakarta-%{short_name}-javadoc < %{version} +Provides: jakarta-%{short_name}-javadoc = %{version}-%{release} +Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release} %description javadoc This package contains the API documentation for %{name}. diff --git a/build.xml.tar.bz2 b/build.xml.tar.bz2 index 34840d8..d092964 100644 --- a/build.xml.tar.bz2 +++ b/build.xml.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7d2cd321bc2a81e5bd7668a3bb07b5b3b62cdc513dfac7be8b9b290817d64b25 -size 3094 +oid sha256:a4e4b0af7f48d4f5e30fd3c65775ba937ef69993c0ccb37e727492d237517428 +size 3472 From 01351b51304760ef6025322cca3996e04a9967a654d8a9fd2ad57b7791230a26 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 12 Feb 2021 13:11:04 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-cli?expand=0&rev=31 --- apache-commons-cli-build.xml | 128 +++++++++++++++++++++++++++++++++++ apache-commons-cli.spec | 9 ++- build.xml.tar.bz2 | 3 - 3 files changed, 132 insertions(+), 8 deletions(-) create mode 100644 apache-commons-cli-build.xml delete mode 100644 build.xml.tar.bz2 diff --git a/apache-commons-cli-build.xml b/apache-commons-cli-build.xml new file mode 100644 index 0000000..fc144d1 --- /dev/null +++ b/apache-commons-cli-build.xml @@ -0,0 +1,128 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index e5004cf..b4f4bee 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -26,7 +26,7 @@ License: Apache-2.0 Group: Development/Libraries/Java URL: http://commons.apache.org/%{base_name}/ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz -Source1: build.xml.tar.bz2 +Source1: %{name}-build.xml Patch0: CLI-253-workaround.patch BuildRequires: ant BuildRequires: fdupes @@ -51,15 +51,14 @@ Obsoletes: jakarta-%{short_name}-javadoc < %{version}-%{release} This package contains the API documentation for %{name}. %prep -%setup -q -n %{short_name}-%{version}-src -a1 +%setup -q -n %{short_name}-%{version}-src +cp %{SOURCE1} build.xml %patch0 -p1 %pom_remove_parent %build -ant -Dmaven.mode.offline=true package javadoc \ - -Dmaven.test.skip=true \ - -lib %{_datadir}/java +%ant package javadoc %install # jars diff --git a/build.xml.tar.bz2 b/build.xml.tar.bz2 deleted file mode 100644 index d092964..0000000 --- a/build.xml.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a4e4b0af7f48d4f5e30fd3c65775ba937ef69993c0ccb37e727492d237517428 -size 3472 From 8592327d62933dd1b388f4b49fea93d9d87b46c704554a8498243b24365f1b8d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 12 Feb 2021 13:13:40 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-cli?expand=0&rev=32 --- apache-commons-cli-build.xml | 42 ++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/apache-commons-cli-build.xml b/apache-commons-cli-build.xml index fc144d1..63c1d0d 100644 --- a/apache-commons-cli-build.xml +++ b/apache-commons-cli-build.xml @@ -102,27 +102,27 @@ index="false" basedir="${build.outputDir}" excludes="**/package.html"> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + +