Accepting request 645582 from Java:packages
Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/645582 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-cli?expand=0&rev=10
This commit is contained in:
commit
2f3f2cc7da
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 23 17:55:39 UTC 2018 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Upgrade to version 1.4
|
||||
- Modify the build.xml.tar.bz2 to build with source/target 8 and
|
||||
adapt for the commons-cli-1.4
|
||||
- Modified patch:
|
||||
* commons-cli-1.2-jdk9.patch -> commons-cli-1.4-jdk9.patch
|
||||
+ Rediff the remaining hunk to the changed context of pom.xml
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue May 15 06:21:41 UTC 2018 - fstrba@suse.com
|
||||
|
||||
|
@ -12,14 +12,14 @@
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%global base_name cli
|
||||
%global short_name commons-%{base_name}
|
||||
Name: apache-commons-cli
|
||||
Version: 1.2
|
||||
Version: 1.4
|
||||
Release: 0
|
||||
Summary: Command Line Interface Library for Java
|
||||
License: Apache-2.0
|
||||
@ -27,7 +27,7 @@ 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
|
||||
Patch0: commons-cli-1.2-jdk9.patch
|
||||
Patch0: commons-cli-1.4-jdk9.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
BuildRequires: ant
|
||||
@ -39,8 +39,7 @@ Requires: java >= 1.8
|
||||
Provides: jakarta-%{short_name} = %{version}-%{release}
|
||||
Obsoletes: jakarta-%{short_name} < %{version}
|
||||
Provides: apache-cli = %{version}
|
||||
Provides: java(commons-cli:commons-cli) = %{version}
|
||||
Obsoletes: apache-cli < 1.2
|
||||
Obsoletes: apache-cli < %{version}
|
||||
|
||||
%description
|
||||
The CLI library provides a simple and easy to use API for working with the
|
||||
@ -70,14 +69,14 @@ ant -Dmaven.mode.offline=true package javadoc \
|
||||
|
||||
%install
|
||||
# jars
|
||||
install -Dpm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|apache-||g"`; done)
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
install -Dpm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} apache-${jar}; done)
|
||||
(cd %{buildroot}%{_javadir} && for jar in *-%{version}*.jar; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done)
|
||||
|
||||
# pom
|
||||
install -d -m 755 %{buildroot}%{_mavenpomdir}
|
||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
|
||||
%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
|
||||
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}-%{version}.pom
|
||||
%add_maven_depmap %{short_name}-%{version}.pom %{short_name}-%{version}.jar -a "org.apache.commons:%{short_name}"
|
||||
|
||||
# javadoc
|
||||
install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||
@ -87,7 +86,7 @@ ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
|
||||
%doc LICENSE.txt NOTICE.txt README.md RELEASE-NOTES.txt CONTRIBUTING.md
|
||||
%{_javadir}/*
|
||||
%{_mavenpomdir}/*
|
||||
%if %{defined _maven_repository}
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:010d33fe3c68bd363b35bd388a7229e974c2821e2656decf87544e7ff791aa47
|
||||
size 2845
|
||||
oid sha256:7d2cd321bc2a81e5bd7668a3bb07b5b3b62cdc513dfac7be8b9b290817d64b25
|
||||
size 3094
|
||||
|
@ -1,70 +0,0 @@
|
||||
--- commons-cli-1.2-src/maven-build.properties 2017-09-14 11:28:42.076085832 +0200
|
||||
+++ commons-cli-1.2-src/maven-build.properties 2017-09-14 11:30:28.515332100 +0200
|
||||
@@ -2,7 +2,7 @@
|
||||
#Tue Feb 01 23:35:00 MST 2011
|
||||
commons.manifestfile=target/osgi/MANIFEST.MF
|
||||
maven.settings.offline=true
|
||||
-maven.compile.target=1.4
|
||||
+maven.compile.target=8
|
||||
maven.build.finalName=commons-cli-1.2
|
||||
commons.release.name=commons-cli-1.2
|
||||
maven.build.resourceDir.0=.
|
||||
@@ -21,7 +21,7 @@
|
||||
commons.osgi.import=*
|
||||
commons.encoding=iso-8859-1
|
||||
commons.osgi.symbolicName=org.apache.commons.cli
|
||||
-maven.compile.source=1.4
|
||||
+maven.compile.source=8
|
||||
organization.logo=http\://www.apache.org/images/asf_logo_wide.gif
|
||||
commons.osgi.dynamicImport=
|
||||
maven.build.testDir.0=src/test
|
||||
--- commons-cli-1.2-src/maven-build.xml 2017-09-14 11:28:42.076085832 +0200
|
||||
+++ commons-cli-1.2-src/maven-build.xml 2017-09-14 11:30:13.055332041 +0200
|
||||
@@ -68,10 +68,10 @@
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
- target="1.4"
|
||||
+ target="8"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
- source="1.4">
|
||||
+ source="8">
|
||||
<src>
|
||||
<pathelement location="${maven.build.srcDir.0}"/>
|
||||
</src>
|
||||
@@ -101,10 +101,10 @@
|
||||
debug="true"
|
||||
optimize="false"
|
||||
deprecation="true"
|
||||
- target="1.4"
|
||||
+ target="8"
|
||||
verbose="false"
|
||||
fork="false"
|
||||
- source="1.4">
|
||||
+ source="8">
|
||||
<src>
|
||||
<pathelement location="${maven.build.testDir.0}"/>
|
||||
</src>
|
||||
@@ -202,7 +202,7 @@
|
||||
nonavbar="false"
|
||||
serialwarn="false"
|
||||
charset="ISO-8859-1"
|
||||
- source="1.4"
|
||||
+ source="8"
|
||||
linksource="true"
|
||||
breakiterator="false">
|
||||
<link href="http://java.sun.com/javase/6/docs/api/"/>
|
||||
--- commons-cli-1.2-src/pom.xml 2017-09-14 11:28:42.076085832 +0200
|
||||
+++ commons-cli-1.2-src/pom.xml 2017-09-14 11:30:04.343332008 +0200
|
||||
@@ -128,8 +128,8 @@
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
- <maven.compile.source>1.4</maven.compile.source>
|
||||
- <maven.compile.target>1.4</maven.compile.target>
|
||||
+ <maven.compile.source>8</maven.compile.source>
|
||||
+ <maven.compile.target>8</maven.compile.target>
|
||||
<commons.componentid>cli</commons.componentid>
|
||||
<commons.release.version>1.2</commons.release.version>
|
||||
<commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b589cd675866aec12a068e0717f2bd52ead6128c43ba1612a8815db1df7f6e67
|
||||
size 68594
|
13
commons-cli-1.4-jdk9.patch
Normal file
13
commons-cli-1.4-jdk9.patch
Normal file
@ -0,0 +1,13 @@
|
||||
--- commons-cli-1.4-src/pom.xml 2017-03-09 13:59:23.000000000 +0100
|
||||
+++ commons-cli-1.4-src/pom.xml 2018-10-23 19:42:13.605822641 +0200
|
||||
@@ -163,8 +163,8 @@
|
||||
</dependencies>
|
||||
|
||||
<properties>
|
||||
- <maven.compiler.source>1.5</maven.compiler.source>
|
||||
- <maven.compiler.target>1.5</maven.compiler.target>
|
||||
+ <maven.compiler.source>8</maven.compiler.source>
|
||||
+ <maven.compiler.target>8</maven.compiler.target>
|
||||
<commons.componentid>cli</commons.componentid>
|
||||
<commons.release.version>1.4</commons.release.version>
|
||||
<commons.release.name>commons-cli-${commons.release.version}</commons.release.name>
|
3
commons-cli-1.4-src.tar.gz
Normal file
3
commons-cli-1.4-src.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a1def8d94e4fe6be4ffde100a74a647fe3df5ba02f85e3c9191fbb00be880f16
|
||||
size 148530
|
Loading…
x
Reference in New Issue
Block a user