Bootstrap build
This commit is contained in:
parent
7284283229
commit
b21fd677ed
25
ant-1.10.2-bootstrap.patch
Normal file
25
ant-1.10.2-bootstrap.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
--- build.xml~ 2018-02-07 11:48:12.344520649 +0100
|
||||||
|
+++ build.xml 2018-02-07 11:56:28.314072462 +0100
|
||||||
|
@@ -383,9 +383,6 @@
|
||||||
|
</condition>
|
||||||
|
<property name="ignoresystemclasses" value="false"/>
|
||||||
|
<available property="jdk9+" classname="java.lang.module.ModuleDescriptor"/>
|
||||||
|
- <condition property="jdk10+">
|
||||||
|
- <javaversion atleast="10"/>
|
||||||
|
- </condition>
|
||||||
|
<available property="kaffe" classname="kaffe.util.NotImplemented"/>
|
||||||
|
<available property="harmony"
|
||||||
|
classname="org.apache.harmony.luni.util.Base64"/>
|
||||||
|
@@ -1616,11 +1613,7 @@
|
||||||
|
|
||||||
|
<target name="test-init" depends="probe-offline,check-optional-packages,dump-info">
|
||||||
|
<mkdir dir="${build.junit.tmpdir}"/>
|
||||||
|
- <condition property="sun.io.useCanonCaches" value="false">
|
||||||
|
- <not>
|
||||||
|
- <javaversion atleast="9"/>
|
||||||
|
- </not>
|
||||||
|
- </condition>
|
||||||
|
+ <property name="sun.io.useCanonCaches" value="false"/>
|
||||||
|
<macrodef name="test-junit">
|
||||||
|
<element name="junit-nested" implicit="true"/>
|
||||||
|
<sequential>
|
7
ant.spec
7
ant.spec
@ -35,7 +35,7 @@
|
|||||||
|
|
||||||
Name: ant
|
Name: ant
|
||||||
Version: 1.10.2
|
Version: 1.10.2
|
||||||
Release: 1%{?dist}
|
Release: 0.1%{?dist}
|
||||||
Epoch: 0
|
Epoch: 0
|
||||||
Summary: Java build tool
|
Summary: Java build tool
|
||||||
Summary(it): Tool per la compilazione di programmi java
|
Summary(it): Tool per la compilazione di programmi java
|
||||||
@ -47,6 +47,7 @@ Source2: apache-ant-1.8.ant.conf
|
|||||||
|
|
||||||
# Fix some places where copies of classes are included in the wrong jarfiles
|
# Fix some places where copies of classes are included in the wrong jarfiles
|
||||||
Patch4: apache-ant-class-path-in-manifest.patch
|
Patch4: apache-ant-class-path-in-manifest.patch
|
||||||
|
Patch5: ant-1.10.2-bootstrap.patch
|
||||||
|
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: java-devel >= 1:1.8.0
|
BuildRequires: java-devel >= 1:1.8.0
|
||||||
@ -324,6 +325,7 @@ find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
|
|||||||
|
|
||||||
# Fix class-path-in-manifest rpmlint warning
|
# Fix class-path-in-manifest rpmlint warning
|
||||||
%patch4
|
%patch4
|
||||||
|
%patch5
|
||||||
|
|
||||||
# clean jar files
|
# clean jar files
|
||||||
find . -name "*.jar" | xargs -t rm
|
find . -name "*.jar" | xargs -t rm
|
||||||
@ -592,6 +594,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
|||||||
# -----------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Feb 7 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.2-0.1
|
||||||
|
- Bootstrap build
|
||||||
|
|
||||||
* Wed Feb 7 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.2-1
|
* Wed Feb 7 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.2-1
|
||||||
- Update to upstream version 1.10.2
|
- Update to upstream version 1.10.2
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user