.ant.metadata

@@ -1 +1 @@
-24ceef44b43cd2726c865d0de5168a84a1cb30c7 SOURCES/apache-ant-1.10.7-src.tar.bz2
+ee74a29a62cf43d6ba5f6b125c3f0c65f14d6336 SOURCES/apache-ant-1.10.5-src.tar.bz2

.gitignore

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

SOURCES/ant-build.xml.patch

@@ -1,46 +0,0 @@
---- 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"/>
--        <attribute name="Class-Path" value="ant.jar xalan.jar"/>
-       </manifest>
-     </jar>
- 
-@@ -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"/>
-+      </fileset>
- 
-       <!-- hide some meta information for javadoc -->
-       <tag name="todo" description="To do:" scope="all"/>

SPECS/ant.spec

@@ -28,11 +28,18 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+%bcond_without tests
+%bcond_without javadoc
+
+# Disabled for now, asi it doesn't work (tests fail) and nobody needs it
+%bcond_with junit5
+
 %global ant_home %{_datadir}/ant
 
 Name:           ant
-Version:        1.10.7
+Version:        1.10.5
-Release:        2%{?dist}
+Release:        1%{?dist}
+Epoch:          0
 Summary:        Java build tool
 Summary(it):    Tool per la compilazione di programmi java
 Summary(fr):    Outil de compilation pour java
@@ -43,8 +50,6 @@ Source2:        apache-ant-1.8.ant.conf
 # manpage
 Source3:        ant.asciidoc
 
-Patch0:         %{name}-build.xml.patch
-
 BuildRequires:  javapackages-local
 BuildRequires:  java-devel >= 1:1.8.0
 BuildRequires:  ant >= 1.10.2
@@ -71,17 +76,15 @@ BuildRequires:  mvn(xml-resolver:xml-resolver)
 BuildRequires:  mvn(org.hamcrest:hamcrest-core)
 BuildRequires:  mvn(org.hamcrest:hamcrest-library)
 
+%if %{with junit5}
 BuildRequires:  junit5
+%endif
 
 # 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
+%{?fedora:Recommends}%{!?fedora:Requires}: java-devel >= 1:1.8.0
-Recommends: java-devel >= 1:1.8.0
-%else
-Requires: java-devel >= 1:1.8.0
-%endif
 
-Requires:       %{name}-lib = %{version}-%{release}
+Requires:       %{name}-lib = %{epoch}:%{version}-%{release}
 # Require full javapackages-tools since the ant script uses
 # /usr/share/java-utils/java-functions
 Requires:       javapackages-tools
@@ -117,7 +120,7 @@ Core part of Apache Ant that can be used as a library.
 
 %package jmf
 Summary:        Optional jmf tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description jmf
 Optional jmf tasks for %{name}.
@@ -127,7 +130,7 @@ Taches jmf optionelles pour %{name}.
 
 %package swing
 Summary:        Optional swing tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description swing
 Optional swing tasks for %{name}.
@@ -137,7 +140,7 @@ Taches swing optionelles pour %{name}.
 
 %package antlr
 Summary:        Optional antlr tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description antlr
 Optional antlr tasks for %{name}.
@@ -147,7 +150,7 @@ Taches antlr optionelles pour %{name}.
 
 %package apache-bsf
 Summary:        Optional apache bsf tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description apache-bsf
 Optional apache bsf tasks for %{name}.
@@ -157,7 +160,7 @@ Taches apache bsf optionelles pour %{name}.
 
 %package apache-resolver
 Summary:        Optional apache resolver tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description apache-resolver
 Optional apache resolver tasks for %{name}.
@@ -167,7 +170,7 @@ Taches apache resolver optionelles pour %{name}.
 
 %package commons-logging
 Summary:        Optional commons logging tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description commons-logging
 Optional commons logging tasks for %{name}.
@@ -177,7 +180,7 @@ Taches commons logging optionelles pour %{name}.
 
 %package commons-net
 Summary:        Optional commons net tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description commons-net
 Optional commons net tasks for %{name}.
@@ -186,10 +189,21 @@ Optional commons net tasks for %{name}.
 Taches commons net optionelles pour %{name}.
 
 # Disable because we don't ship the dependencies
+%if 0
+%package jai
+Summary:        Optional jai tasks for %{name}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
+
+%description jai
+Optional jai tasks for %{name}.
+
+%description jai -l fr
+Taches jai optionelles pour %{name}.
+%endif
 
 %package apache-bcel
 Summary:        Optional apache bcel tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description apache-bcel
 Optional apache bcel tasks for %{name}.
@@ -199,7 +213,7 @@ Taches apache bcel optionelles pour %{name}.
 
 %package apache-log4j
 Summary:        Optional apache log4j tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description apache-log4j
 Optional apache log4j tasks for %{name}.
@@ -209,7 +223,7 @@ Taches apache log4j optionelles pour %{name}.
 
 %package apache-oro
 Summary:        Optional apache oro tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description apache-oro
 Optional apache oro tasks for %{name}.
@@ -219,7 +233,7 @@ Taches apache oro optionelles pour %{name}.
 
 %package apache-regexp
 Summary:        Optional apache regexp tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description apache-regexp
 Optional apache regexp tasks for %{name}.
@@ -229,7 +243,7 @@ Taches apache regexp optionelles pour %{name}.
 
 %package apache-xalan2
 Summary:        Optional apache xalan2 tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description apache-xalan2
 Optional apache xalan2 tasks for %{name}.
@@ -237,16 +251,9 @@ Optional apache xalan2 tasks for %{name}.
 %description apache-xalan2 -l fr
 Taches apache xalan2 optionelles pour %{name}.
 
-%package imageio
-Summary:        Optional imageio tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
-
-%description imageio
-Optional imageio tasks for %{name}.
-
 %package javamail
 Summary:        Optional javamail tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description javamail
 Optional javamail tasks for %{name}.
@@ -256,7 +263,7 @@ Taches javamail optionelles pour %{name}.
 
 %package jdepend
 Summary:        Optional jdepend tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description jdepend
 Optional jdepend tasks for %{name}.
@@ -266,7 +273,7 @@ Taches jdepend optionelles pour %{name}.
 
 %package jsch
 Summary:        Optional jsch tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description jsch
 Optional jsch tasks for %{name}.
@@ -276,7 +283,7 @@ Taches jsch optionelles pour %{name}.
 
 %package junit
 Summary:        Optional junit tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description junit
 Optional junit tasks for %{name}.
@@ -284,26 +291,28 @@ Optional junit tasks for %{name}.
 %description junit -l fr
 Taches junit optionelles pour %{name}.
 
+%if %{with junit5}
 %package junit5
 Summary:        Optional junit5 tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description junit5
 Optional junit5 tasks for %{name}.
 
 %description junit5 -l fr
 Taches junit5 optionelles pour %{name}.
+%endif
 
 %package testutil
 Summary:        Test utility classes for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description testutil
 Test utility tasks for %{name}.
 
 %package xz
 Summary:        Optional xz tasks for %{name}
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name} = %{epoch}:%{version}-%{release}
 
 %description xz
 Optional xz tasks for %{name}.
@@ -333,15 +342,13 @@ Javadoc pour %{name}.
 
 %prep
 %setup -q -n apache-ant-%{version}
-%patch0 -p1
+
+# Fix class-path-in-manifest rpmlint warning
+%pom_xpath_remove 'attribute[@name="Class-Path"]' build.xml
 
 # clean jar files
 find . -name "*.jar" | xargs -t rm
 
-# Use our own version of javamail
-%pom_remove_dep com.sun.mail:jakarta.mail src/etc/poms/ant-javamail
-%pom_add_dep com.sun.mail:javax.mail::compile src/etc/poms/ant-javamail
-
 # failing testcases. TODO see why
 rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.java \
    src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsFileSelectedTest.java \
@@ -350,7 +357,10 @@ 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 junit5 opentest4j
+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
+%if %{with junit5}
+build-jar-repository -s -p lib/optional junit5 opentest4j
+%endif
 
 # fix hardcoded paths in ant script and conf
 cp -p %{SOURCE2} %{name}.conf
@@ -373,8 +383,16 @@ mv LICENSE.utf8 LICENSE
 # We want a hard dep on antlr
 %pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml
 
+%if %{without junit5}
+%pom_xpath_inject 'target[@name="javadocs"]/javadoc/packageset' '<exclude name="**/junitlauncher"/>' build.xml
+%endif
+
 %build
-%{ant} jars test-jar javadocs
+%{ant} jars test-jar
+
+%if %with javadoc
+%{ant} javadocs
+%endif
 
 # typeset the manpage
 mkdir man
@@ -383,6 +401,9 @@ xmlto man man/%{name}.xml -o man
 
 #remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests.
 rm -fr build/lib/ant-jai.jar build/lib/ant-netrexx.jar
+%if %{without junit5}
+rm -f build/lib/ant-junitlauncher.jar
+%endif
 # -----------------------------------------------------------------------------
 
 %install
@@ -457,19 +478,23 @@ echo "log4j12 ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/ap
 echo "oro ant/ant-apache-oro" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-oro
 echo "regexp ant/ant-apache-regexp" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-regexp
 echo "xalan-j2 xalan-j2-serializer ant/ant-apache-xalan2" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-xalan2
-echo "ant/ant-imageio" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/imageio
 echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/javamail
 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
 
+%if %{with junit5}
+echo "junit5 hamcrest/core junit opentest4j ant/ant-junitlauncher" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junitlauncher
+%endif
+
+%if %with javadoc
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+%endif
 
 # fix link between manual and javadoc
 (cd manual; ln -sf %{_javadocdir}/%{name} api)
@@ -478,13 +503,10 @@ cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 install -d -m 755 %{buildroot}%{_mandir}/man1/
 install -p -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
+%if %with tests
 %check
-%if 0%{?rhel} && 0%{?rhel} <= 7
+LC_ALL=en_US.utf8 %{ant} test
-export LC_ALL=en_US.UTF-8
-%else
-export LC_ALL=C.UTF-8
 %endif
-%{ant} test
 
 %files
 %doc KEYS README WHATSNEW
@@ -542,6 +564,11 @@ export LC_ALL=C.UTF-8
 %config(noreplace) %{_sysconfdir}/%{name}.d/commons-net
 
 # Disable as we dont ship the dependencies
+%if 0
+%files jai -f .mfiles-jai
+%{ant_home}/lib/%{name}-jai.jar
+%config(noreplace) %{_sysconfdir}/%{name}.d/jai
+%endif
 
 %files apache-bcel -f .mfiles-apache-bcel
 %{ant_home}/lib/%{name}-apache-bcel.jar
@@ -564,10 +591,6 @@ export LC_ALL=C.UTF-8
 %{ant_home}/lib/%{name}-apache-xalan2.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/apache-xalan2
 
-%files imageio -f .mfiles-imageio
-%{ant_home}/lib/%{name}-imageio.jar
-%config(noreplace) %{_sysconfdir}/%{name}.d/imageio
-
 %files javamail -f .mfiles-javamail
 %{ant_home}/lib/%{name}-javamail.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/javamail
@@ -593,9 +616,11 @@ export LC_ALL=C.UTF-8
 %{ant_home}/etc/junit-frames-saxon.xsl
 %{ant_home}/etc/junit-noframes-saxon.xsl
 
+%if %{with junit5}
 %files junit5 -f .mfiles-junitlauncher
 %{ant_home}/lib/%{name}-junitlauncher.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/junitlauncher
+%endif
 
 %files testutil -f .mfiles-testutil
 %{ant_home}/lib/%{name}-testutil.jar
@@ -609,32 +634,15 @@ export LC_ALL=C.UTF-8
 %license LICENSE NOTICE
 %doc manual/*
 
+%if %with javadoc
 %files javadoc
 %license LICENSE NOTICE
 %{_javadocdir}/%{name}
+%endif
 
 # -----------------------------------------------------------------------------
 
 %changelog
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.7-2
-- Mass rebuild for javapackages-tools 201902
-
-* Wed Oct 16 2019 Marian Koncek <mkoncek@redhat.com> - 1.10.7-1
-- Update to upstream version 1.10.7
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.6-2
-- Mass rebuild for javapackages-tools 201901
-
-* Wed May 08 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.10.6-1
-- Update to upstream version 1.10.6
-
-* Mon Nov 19 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0:1.10.5-3
-- Use C.UTF-8 locale
-  See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
-
-* Mon Aug 20 2018 Mat Booth <mat.booth@redhat.com> - 0:1.10.5-2
-- Enable building the optional junit5 module
-
 * Thu Aug 02 2018 Michael Simacek <msimacek@redhat.com> - 0:1.10.5-1
 - Update to upstream version 1.10.5