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

OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=35

Browse Source
This commit is contained in:
Fridrich Strba 2018-05-15 13:28:26 +00:00 committed by Git OBS Bridge
parent a18daec9fb
commit 4dfaacc5d7
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache-ivy-2.3.0-jdk9.patch
View File

@ -5,7 +5,7 @@
rat.report.dir=${reports.dir}/rat rat.report.dir=${reports.dir}/rat
-ivy.minimum.javaversion=1.4 -ivy.minimum.javaversion=1.4
+ivy.minimum.javaversion=1.6 +ivy.minimum.javaversion=1.8
debug.mode=on debug.mode=on
ivy.install.version=1.4.1 ivy.install.version=1.4.1

9
apache-ivy.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue May 15 13:26:55 UTC 2018 - fstrba@suse.com
- Modified patch:
* apache-ivy-2.3.0-jdk9.patch
+ Build with source and target 8 to prepare for a possible
removal of 1.6 compatibility in OpenJDK 11
- Run fdupes on documentation
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 7 17:10:15 UTC 2017 - fstrba@suse.com Thu Sep 7 17:10:15 UTC 2017 - fstrba@suse.com

6
apache-ivy.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-ivy # spec file for package apache-ivy
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -31,7 +31,8 @@ BuildRequires: ant
BuildRequires: bouncycastle BuildRequires: bouncycastle
BuildRequires: commons-httpclient BuildRequires: commons-httpclient
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: java-devel >= 1.6 BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: jsch BuildRequires: jsch
@ -98,6 +99,7 @@ install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom
# API Documentation # API Documentation
install -d %{buildroot}%{_javadocdir}/%{name} install -d %{buildroot}%{_javadocdir}/%{name}
cp -rp build/doc/reports/api/. %{buildroot}%{_javadocdir}/%{name} cp -rp build/doc/reports/api/. %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
# Command line script # Command line script
MAIN_CLASS=`sed -rn 's/^Main-Class: (.*)$/\1/gp' META-INF/MANIFEST.MF | tr -d '\r'` MAIN_CLASS=`sed -rn 's/^Main-Class: (.*)$/\1/gp' META-INF/MANIFEST.MF | tr -d '\r'`