diff --git a/ant-1.10.2-bootstrap.patch b/ant-1.10.2-bootstrap.patch new file mode 100644 index 0000000..b9fee49 --- /dev/null +++ b/ant-1.10.2-bootstrap.patch @@ -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 @@ + + + +- +- +- + + +@@ -1616,11 +1613,7 @@ + + + +- +- +- +- +- ++ + + + diff --git a/ant.spec b/ant.spec index b17fc2e..36e4052 100644 --- a/ant.spec +++ b/ant.spec @@ -35,7 +35,7 @@ Name: ant Version: 1.10.2 -Release: 1%{?dist} +Release: 0.1%{?dist} Epoch: 0 Summary: Java build tool 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 Patch4: apache-ant-class-path-in-manifest.patch +Patch5: ant-1.10.2-bootstrap.patch BuildRequires: javapackages-local 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 %patch4 +%patch5 # clean jar files find . -name "*.jar" | xargs -t rm @@ -592,6 +594,9 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ----------------------------------------------------------------------------- %changelog +* Wed Feb 7 2018 Mikolaj Izdebski - 0:1.10.2-0.1 +- Bootstrap build + * Wed Feb 7 2018 Mikolaj Izdebski - 0:1.10.2-1 - Update to upstream version 1.10.2