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

Compare commits

merge into: rpms:c8-beta-stream-1.10
Branches Tags
rpms:c8-stream-201902
rpms:c9s
rpms:c10s
rpms:c9-beta
rpms:c8-stream-1.10
rpms:c8-beta-stream-1.10
rpms:stream-ant-1.10-rhel-8.10.0
rpms:stream-javapackages-tools-202201-rhel-8.10.0
rpms:stream-javapackages-tools-202201-rhel-9.4.0
rpms:stream-ant-1.10-rhel-8.9.0
rpms:stream-javapackages-bootstrap-202201-rhel-8.9.0
rpms:stream-javapackages-tools-201801-rhel-8.10.0
rpms:stream-javapackages-tools-201801-rhel-8.9.0
rpms:stream-javapackages-tools-201902-rhel-8.9.0
rpms:c8-beta-stream-202201
rpms:c9-beta-stream-202201
rpms:stream-javapackages-tools-202201-rhel-9.1.0
rpms:stream-javapackages-tools-202201-rhel-9.3.0
rpms:stream-javapackages-tools-202201-rhel-8.9.0
rpms:c8s-stream-201902
rpms:c9
rpms:c8-beta-stream-201801
rpms:c8-stream-201801
rpms:imports/c10s/ant-1.10.14-11.el10
rpms:imports/c9-beta/ant-1.10.9-8.el9
rpms:imports/c10s/ant-1.10.14-10.el10
rpms:imports/c10s/ant-1.10.14-8.el10
rpms:imports/c8-stream-1.10/ant-1.10.9-1.module_el8.10.0+3759+f5d3ff2b
rpms:imports/c8s-stream-201902/ant-1.10.7-2.module+el8.3.0+7256+fe62c937
rpms:imports/c9/ant-1.10.9-7.el9
rpms:imports/c9-beta/ant-1.10.9-7.el9
rpms:imports/c8-beta-stream-201801/ant-1.10.5-1.module+el8+2598+06babf2e
rpms:imports/c8-beta-stream-1.10/ant-1.10.5-1.module+el8+2438+c99a8a1e
rpms:imports/c8-stream-201801/ant-1.10.5-1.module+el8+2598+06babf2e
rpms:imports/c8-stream-1.10/ant-1.10.5-1.module+el8+2438+c99a8a1e
rpms:imports/c8-stream-201902/ant-1.10.7-2.module+el8.2.0+4938+c0cffa5b
...
pull from: rpms:c8-stream-201902
Branches Tags
rpms:c9s
rpms:c10s
rpms:c9-beta
rpms:c8-stream-1.10
rpms:c8-beta-stream-1.10
rpms:stream-ant-1.10-rhel-8.10.0
rpms:stream-javapackages-tools-202201-rhel-8.10.0
rpms:stream-javapackages-tools-202201-rhel-9.4.0
rpms:stream-ant-1.10-rhel-8.9.0
rpms:stream-javapackages-bootstrap-202201-rhel-8.9.0
rpms:stream-javapackages-tools-201801-rhel-8.10.0
rpms:stream-javapackages-tools-201801-rhel-8.9.0
rpms:stream-javapackages-tools-201902-rhel-8.9.0
rpms:c8-beta-stream-202201
rpms:c9-beta-stream-202201
rpms:stream-javapackages-tools-202201-rhel-9.1.0
rpms:stream-javapackages-tools-202201-rhel-9.3.0
rpms:stream-javapackages-tools-202201-rhel-8.9.0
rpms:c8s-stream-201902
rpms:c9
rpms:c8-beta-stream-201801
rpms:c8-stream-201801
rpms:c8-stream-201902
rpms:imports/c10s/ant-1.10.14-11.el10
rpms:imports/c9-beta/ant-1.10.9-8.el9
rpms:imports/c10s/ant-1.10.14-10.el10
rpms:imports/c10s/ant-1.10.14-8.el10
rpms:imports/c8-stream-1.10/ant-1.10.9-1.module_el8.10.0+3759+f5d3ff2b
rpms:imports/c8s-stream-201902/ant-1.10.7-2.module+el8.3.0+7256+fe62c937
rpms:imports/c9/ant-1.10.9-7.el9
rpms:imports/c9-beta/ant-1.10.9-7.el9
rpms:imports/c8-beta-stream-201801/ant-1.10.5-1.module+el8+2598+06babf2e
rpms:imports/c8-beta-stream-1.10/ant-1.10.5-1.module+el8+2438+c99a8a1e
rpms:imports/c8-stream-201801/ant-1.10.5-1.module+el8+2598+06babf2e
rpms:imports/c8-stream-1.10/ant-1.10.5-1.module+el8+2438+c99a8a1e
rpms:imports/c8-stream-201902/ant-1.10.7-2.module+el8.2.0+4938+c0cffa5b

No commits in common. "c8-beta-stream-1.10" and "c8-stream-201902" have entirely different histories.
c8-beta-st ... c8-stream-

4 changed files with 60 additions and 35 deletions
Show Stats Expand all files Collapse all files

2
.ant.metadata
View File

@ -1 +1 @@
7760da2f3f5708ee0975caf634df16d5567fffe5 SOURCES/apache-ant-1.10.9-src.tar.bz2
24ceef44b43cd2726c865d0de5168a84a1cb30c7 SOURCES/apache-ant-1.10.7-src.tar.bz2

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/apache-ant-1.10.9-src.tar.bz2
SOURCES/apache-ant-1.10.7-src.tar.bz2

55
SOURCES/ant-build.xml.patch
View File

@ -1,6 +1,15 @@
--- build.xml~ 2021-05-17 12:32:48.406394876 +0200
+++ build.xml 2021-05-17 12:32:39.990389601 +0200
@@ -819,7 +817,6 @@
--- apache-ant-1.10.7/build.xml~ 2019-10-31 14:10:07.739864466 +0100
+++ apache-ant-1.10.7/build.xml 2019-10-31 14:10:12.018897830 +0100
@@ -145,8 +145,6 @@
-->
<pathelement location="${src.junit}"/>
<pathelement location="${tests.etc.dir}"/>
- <!-- Otherwise many tests fail with "com.sun.tools.javac.Main is not on the classpath.": -->
- <pathelement location="${java.home}/../lib/tools.jar"/>
</path>
<!--
@@ -801,7 +799,6 @@
</metainf>
<manifest>
<attribute name="Main-Class" value="org.apache.tools.ant.Main"/>
@ -8,29 +17,29 @@
</manifest>
</jar>
@@ -1562,7 +1559,25 @@
verbose="${javadoc.verbose}"
additionalparam="${javadoc.doclint.none}">
@@ -1543,7 +1540,25 @@
maxmemory="1000M"
verbose="${javadoc.verbose}">
- <packageset dir="${java.dir}"/>
+ <fileset dir="${java.dir}">
+ <include name="**/*.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
+ <include name="**/*.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/email/MimeMailer.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/optional/NetRexxC.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/optional/image/Image.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Arc.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/BasicShape.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Draw.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/DrawOperation.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Ellipse.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/ImageOperation.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Rectangle.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Rotate.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Scale.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/Text.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/TransformOperation.java"/>
+ <exclude name="org/apache/tools/ant/types/optional/image/ColorMapper.java"/>
+ <exclude name="org/apache/tools/ant/taskdefs/optional/image/ImageIOTask.java"/>
+ </fileset>
<!-- hide some meta information for javadoc -->

36
SPECS/ant.spec
View File

@ -31,14 +31,14 @@
%global ant_home %{_datadir}/ant
Name: ant
Version: 1.10.9
Release: 1%{?dist}
Version: 1.10.7
Release: 2%{?dist}
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://archive.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
Source0: https://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2
Source2: apache-ant-1.8.ant.conf
# manpage
Source3: ant.asciidoc
@ -71,6 +71,8 @@ BuildRequires: mvn(xml-resolver:xml-resolver)
BuildRequires: mvn(org.hamcrest:hamcrest-core)
BuildRequires: mvn(org.hamcrest:hamcrest-library)
BuildRequires: junit5
# Theoretically Ant might be usable with just JRE, but typical Ant
# workflow requires full JDK, so we recommend it here.
%if 0%{?fedora} || 0%{?rhel} > 7
@ -282,6 +284,16 @@ Optional junit tasks for %{name}.
%description junit -l fr
Taches junit optionelles pour %{name}.
%package junit5
Summary: Optional junit5 tasks for %{name}
Requires: %{name} = %{version}-%{release}
%description junit5
Optional junit5 tasks for %{name}.
%description junit5 -l fr
Taches junit5 optionelles pour %{name}.
%package testutil
Summary: Test utility classes for %{name}
Requires: %{name} = %{version}-%{release}
@ -321,7 +333,7 @@ Javadoc pour %{name}.
%prep
%setup -q -n apache-ant-%{version}
%patch0 -p0
%patch0 -p1
# clean jar files
find . -name "*.jar" | xargs -t rm
@ -338,7 +350,7 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java
src/tests/junit/org/apache/tools/mail/MailMessageTest.java
#install jars
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java
build-jar-repository -s -p lib/optional antlr bcel javamail/mailapi jdepend junit log4j-1 oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver xalan-j2-serializer hamcrest/core hamcrest/library xz-java junit5 opentest4j
# fix hardcoded paths in ant script and conf
cp -p %{SOURCE2} %{name}.conf
@ -373,8 +385,6 @@ xmlto man man/%{name}.xml -o man
rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
# -----------------------------------------------------------------------------
rm -fr build/lib/ant-junitlauncher.jar
%install
# ANT_HOME and subdirs
mkdir -p $RPM_BUILD_ROOT%{ant_home}/{lib,etc,bin}
@ -453,6 +463,7 @@ echo "jdepend ant/ant-jdepend" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jdepend
echo "jsch ant/ant-jsch" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/jsch
echo "junit hamcrest/core ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junitlauncher
echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
echo "xz-java ant/ant-xz" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/xz
@ -468,7 +479,11 @@ install -d -m 755 %{buildroot}%{_mandir}/man1/
install -p -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
%check
%if 0%{?rhel} && 0%{?rhel} <= 7
export LC_ALL=en_US.UTF-8
%else
export LC_ALL=C.UTF-8
%endif
%{ant} test
%files
@ -578,6 +593,10 @@ export LC_ALL=C.UTF-8
%{ant_home}/etc/junit-frames-saxon.xsl
%{ant_home}/etc/junit-noframes-saxon.xsl
%files junit5 -f .mfiles-junitlauncher
%{ant_home}/lib/%{name}-junitlauncher.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/junitlauncher
%files testutil -f .mfiles-testutil
%{ant_home}/lib/%{name}-testutil.jar
%config(noreplace) %{_sysconfdir}/%{name}.d/testutil
@ -597,9 +616,6 @@ export LC_ALL=C.UTF-8
# -----------------------------------------------------------------------------
%changelog
* Tue Jan 30 2024 Marián Konček <mkoncek@redhat.com> - 1.10.9-1
- Update to upstream version 1.10.9
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.7-2
- Mass rebuild for javapackages-tools 201902