Accepting request 493610 from home:bmwiedemann:branches:Java:packages
- Version bump to 1.9.9: * Read WHATSNEW file for full changelist - Add reproducible.patch to allow reproducible builds of ant itself and packages built with ant like jcodings OBS-URL: https://build.opensuse.org/request/show/493610 OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=79
This commit is contained in:
committed by
Git OBS Bridge
parent
195afdfc36
commit
333f87be39
@@ -36,7 +36,7 @@
|
||||
%global major_version 1.9
|
||||
|
||||
Name: ant-antlr
|
||||
Version: 1.9.6
|
||||
Version: 1.9.9
|
||||
Release: 0
|
||||
Summary: Antlr Task for ant
|
||||
License: Apache-2.0
|
||||
@@ -51,6 +51,8 @@ Patch0: apache-ant-no-test-jar.patch
|
||||
Patch1: apache-ant-class-path-in-manifest.patch
|
||||
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
|
||||
Patch2: apache-ant-old-gcj-build.patch
|
||||
#PATCH-FIX-UPSTREAM -- https://bz.apache.org/bugzilla/show_bug.cgi?id=61079
|
||||
Patch3: reproducible.patch
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
|
||||
@@ -73,6 +75,9 @@ BuildRequires: junit
|
||||
BuildRequires: xerces-j2
|
||||
BuildRequires: xml-commons-apis
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: strip-nondeterminism
|
||||
%endif
|
||||
%if %{with bootstrap}
|
||||
Requires: java-devel >= 1.5.0
|
||||
Requires: javapackages-tools
|
||||
@@ -409,6 +414,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
|
||||
|
||||
# Fix class-path-in-manifest rpmlint warning
|
||||
%patch1
|
||||
%patch3 -p1
|
||||
|
||||
# clean jar files
|
||||
%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm
|
||||
@@ -463,6 +469,7 @@ export BOOTJAVAC_OPTS="-C -Wno-deprecated"
|
||||
sh -x ./build.sh --noconfig jars
|
||||
|
||||
%endif
|
||||
%?strip_all_nondeterminism
|
||||
|
||||
%install
|
||||
# ANT_HOME and subdirs
|
||||
|
Reference in New Issue
Block a user