pool/ant-contrib
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 620741 from Java:packages

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/620741
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ant-contrib?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2018-07-24 15:30:08 +00:00 committed by Git OBS Bridge
commit 09f03aff6a
3 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ant-contrib-sourcetarget.patch
View File

@ -6,5 +6,5 @@
ivy.deliver.revision=${project.version}
-jdk.source=1.4
-jdk.target=1.4
+jdk.source=1.6
+jdk.target=1.6
+jdk.source=8
+jdk.target=8

7
ant-contrib.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 15 05:45:46 UTC 2018 - fstrba@suse.com
- Build with source and target 8 to prepare for a possible removal
of 1.6 compatibility
- Run fdupes on the documentation
-------------------------------------------------------------------
Wed Sep 6 18:17:00 UTC 2017 - fstrba@suse.com

17
ant-contrib.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package ant-contrib
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@ Release: 0
Summary: Collection of tasks for Ant
License: Apache-2.0
Group: Development/Libraries/Java
Url: http://ant-contrib.sourceforge.net/
URL: http://ant-contrib.sourceforge.net/
Source0: http://prdownloads.sourceforge.net/ant-contrib/ant-contrib-%{version}-src.tar.gz
Source1: http://mirrors.ibiblio.org/pub/mirrors/maven2/%{name}/%{name}/1.0b3/%{name}-1.0b3.pom
# ASL 2.0 Licence text
@ -38,7 +38,8 @@ BuildRequires: apache-ivy
BuildRequires: bcel >= 5.1
BuildRequires: commons-httpclient
BuildRequires: commons-logging
BuildRequires: java-devel >= 1.6
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: junit
@ -46,7 +47,6 @@ BuildRequires: xerces-j2
Requires: junit >= 3.8.1
Requires: xerces-j2
%requires_eq ant
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%description
@ -94,6 +94,7 @@ install -Dpm 644 target/%{name}.jar %{buildroot}%{_javadir}/ant/%{name}.jar
# javadoc
install -dm 755 %{buildroot}%{_javadocdir}/%{name}
cp -pr target/docs/api/* %{buildroot}%{_javadocdir}/%{name}
%fdupes -s %{buildroot}%{_javadocdir}/%{name}
mkdir -p %{buildroot}%{_sysconfdir}/ant.d
echo "ant/ant-contrib" > %{buildroot}%{_sysconfdir}/ant.d/ant-contrib
@ -106,19 +107,19 @@ echo "call add_maven_depmap JPP.ant-%{name}.pom ant/%{name}.jar"
%files
%defattr(0644,root,root,0755)
%doc target/docs/LICENSE.txt LICENSE-2.0.txt
%license target/docs/LICENSE.txt
%doc LICENSE-2.0.txt
%config %{_sysconfdir}/ant.d/%{name}
%{_javadir}/ant/%{name}.jar
%{_mavenpomdir}/JPP.ant-%{name}.pom
%{_datadir}/maven-metadata/%{name}.xml
%files manual
%defattr(-,root,root,-)
%doc target/docs/manual/tasks/*
%files javadoc
%defattr(-,root,root,-)
%doc target/docs/LICENSE.txt LICENSE-2.0.txt
%license target/docs/LICENSE.txt
%doc LICENSE-2.0.txt
%doc %{_javadocdir}/%{name}
%changelog