- Add patch to run scripts with python3 if applicable bsc#1082202:

* ant-python3.patch

- Update to 1.9.10:
  * Various fixes for java10
  * Small fixes all around
- Remove merged patch reproducible.patch

- Add patch to run scripts with python3 if applicable bsc#1082202:
  * ant-python3.patch

- Update to 1.9.10:
  * Various fixes for java10
  * Small fixes all around
- Remove merged patch reproducible.patch

- Add patch to run scripts with python3 if applicable bsc#1082202:
  * ant-python3.patch

- Update to 1.9.10:
  * Various fixes for java10
  * Small fixes all around
- Remove merged patch reproducible.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=108
This commit is contained in:
Tomáš Chvátal
2018-02-22 11:49:36 +00:00
committed by Git OBS Bridge
parent 0f335cb333
commit 08e1b5f3e1
15 changed files with 174 additions and 190 deletions

View File

@@ -1,7 +1,7 @@
#
# spec file for package ant-junit
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2000-2009, JPackage Project
#
# All modifications and additions to the file contributed by third parties
@@ -24,7 +24,7 @@
%bcond_without junit
%bcond_with antlr
Name: ant-junit
Version: 1.9.9
Version: 1.9.10
Release: 0
Summary: Optional junit tasks for ant
License: Apache-2.0
@@ -37,12 +37,11 @@ Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.
Source1002: ant.keyring
Patch0: apache-ant-no-test-jar.patch
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
Patch3: reproducible.patch
Patch4: apache-ant-1.9.9-sourcetarget.patch
Patch5: apache-ant-bootstrap.patch
#PATCH-FEATURE-OPENSUSE bmwiedemann -- have fixed build dates
Patch6: reproducible-build-date.patch
Patch7: ant-python3.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-tools
@@ -130,9 +129,9 @@ This package contains optional swing tasks for Apache Ant.
Summary: Additional scripts for ant
License: Apache-2.0
Group: Development/Tools/Building
Requires: %{_bindir}/perl
Requires: %{_bindir}/python
Requires: ant = %{version}
Requires: perl
Requires: python3-base
%description -n ant-scripts
Apache Ant is a Java-based build tool.
@@ -338,10 +337,10 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
%patch0 -p1
%endif
%patch1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
# clean jar files
find . -name "*.jar" -print -delete