rpms/ant
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert unbuilt changes

Browse Source
This commit is contained in:
Michael Simacek 2018-06-26 13:44:08 +02:00
parent 2bf5978adc
commit 138926fe47
4 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -13,4 +13,3 @@ apache-ant-1.8.4-src.tar.bz2
/apache-ant-1.9.7-src.tar.bz2
/apache-ant-1.10.0-src.tar.bz2
/apache-ant-1.10.1-src.tar.bz2
/apache-ant-1.10.2-src.tar.bz2

18
ant.spec
View File

@ -34,15 +34,15 @@
%global ant_home %{_datadir}/ant
Name: ant
Version: 1.10.2
Release: 1%{?dist}
Version: 1.10.1
Release: 9%{?dist}
Epoch: 0
Summary: Java build tool
Summary(it): Tool per la compilazione di programmi java
Summary(fr): Outil de compilation pour java
License: ASL 2.0
URL: https://ant.apache.org/
Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
URL: http://ant.apache.org/
Source0: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
Source2: apache-ant-1.8.ant.conf
# Fix some places where copies of classes are included in the wrong jarfiles
@ -50,7 +50,7 @@ Patch4: apache-ant-class-path-in-manifest.patch
BuildRequires: javapackages-local
BuildRequires: java-devel >= 1:1.8.0
BuildRequires: ant >= 1.10.2
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: mvn(antlr:antlr)
@ -356,6 +356,9 @@ mv KEYS.utf8 KEYS
iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8
mv LICENSE.utf8 LICENSE
# It's part of the JDK now
%pom_remove_dep javax.activation src/etc/poms/ant-javamail/pom.xml
# We want a hard dep on antlr
%pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml
@ -461,7 +464,7 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
%if %with tests
%check
LC_ALL=en_US.utf8 %{ant} test
%{ant} test
%endif
%files
@ -592,9 +595,6 @@ LC_ALL=en_US.utf8 %{ant} test
# -----------------------------------------------------------------------------
%changelog
* Wed Feb 7 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.10.2-1
- Update to upstream version 1.10.2
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.10.1-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

8
apache-ant-class-path-in-manifest.patch
View File

@ -1,12 +1,12 @@
--- build.xml~ 2018-02-03 17:52:24.000000000 +0100
+++ build.xml 2018-02-07 11:46:39.208543741 +0100
@@ -713,10 +713,6 @@
--- build.xml.orig 2012-02-29 13:29:12.000000000 +0200
+++ build.xml 2012-02-29 13:31:36.787937053 +0200
@@ -728,10 +728,6 @@
<include name="LICENSE.txt"/>
<include name="NOTICE.txt"/>
</metainf>
- <manifest>
- <attribute name="Class-Path"
- value="ant.jar xalan.jar"/>
- value="ant.jar xalan.jar"/>
- </manifest>
</jar>

2
sources
View File

@ -1 +1 @@
SHA512 (apache-ant-1.10.2-src.tar.bz2) = ad183d94e1a284719c3c83b8ae4049be0ee7867fd777017f0de8b887d03089925d198d5002a0526d781917ef32a37264018cf90ed8e8a60399f3b64aa87419bb
SHA512 (apache-ant-1.10.1-src.tar.bz2) = c9987c2e219d9770e0e7250998a201b236d7dd9f78b547cd464142200fde13c81c2bc4f186d3dad7a26324b0019af2dd9e1d60786d2ce1532de3dee30792538e