From 8d8f44adbb1754ee488723f8c71877ccb9a62ada Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 12:42:46 +0000 Subject: [PATCH 01/15] Expand conditionals --- ant.spec | 56 -------------------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/ant.spec b/ant.spec index 4f9de6b..24e416d 100644 --- a/ant.spec +++ b/ant.spec @@ -28,11 +28,8 @@ # 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 @@ -76,9 +73,6 @@ 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. @@ -189,17 +183,6 @@ 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} @@ -291,17 +274,6 @@ 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} = %{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} @@ -358,9 +330,6 @@ rm src/tests/junit/org/apache/tools/ant/types/selectors/SignedSelectorTest.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 -%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 @@ -383,16 +352,12 @@ 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' '' build.xml -%endif %build %{ant} jars test-jar -%if %with javadoc %{ant} javadocs -%endif # typeset the manpage mkdir man @@ -401,9 +366,7 @@ 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 @@ -486,15 +449,10 @@ echo "junit hamcrest/core ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name 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) @@ -503,10 +461,8 @@ 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 LC_ALL=en_US.utf8 %{ant} test -%endif %files %doc KEYS README WHATSNEW @@ -564,11 +520,6 @@ LC_ALL=en_US.utf8 %{ant} test %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 @@ -616,11 +567,6 @@ LC_ALL=en_US.utf8 %{ant} test %{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 @@ -634,11 +580,9 @@ LC_ALL=en_US.utf8 %{ant} test %license LICENSE NOTICE %doc manual/* -%if %with javadoc %files javadoc %license LICENSE NOTICE %{_javadocdir}/%{name} -%endif # ----------------------------------------------------------------------------- From 7524df7a045c84b4386a8d46d28d29cdb6a1ee8b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 29 Nov 2018 13:02:12 +0000 Subject: [PATCH 02/15] Remove explicit Epoch --- ant.spec | 39 +++++++++++++++++++-------------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/ant.spec b/ant.spec index 24e416d..5fe8332 100644 --- a/ant.spec +++ b/ant.spec @@ -36,7 +36,6 @@ Name: ant Version: 1.10.5 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 @@ -78,7 +77,7 @@ BuildRequires: mvn(org.hamcrest:hamcrest-library) # workflow requires full JDK, so we recommend it here. %{?fedora:Recommends}%{!?fedora:Requires}: java-devel >= 1:1.8.0 -Requires: %{name}-lib = %{epoch}:%{version}-%{release} +Requires: %{name}-lib = %{version}-%{release} # Require full javapackages-tools since the ant script uses # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -114,7 +113,7 @@ Core part of Apache Ant that can be used as a library. %package jmf Summary: Optional jmf tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description jmf Optional jmf tasks for %{name}. @@ -124,7 +123,7 @@ Taches jmf optionelles pour %{name}. %package swing Summary: Optional swing tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description swing Optional swing tasks for %{name}. @@ -134,7 +133,7 @@ Taches swing optionelles pour %{name}. %package antlr Summary: Optional antlr tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description antlr Optional antlr tasks for %{name}. @@ -144,7 +143,7 @@ Taches antlr optionelles pour %{name}. %package apache-bsf Summary: Optional apache bsf tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description apache-bsf Optional apache bsf tasks for %{name}. @@ -154,7 +153,7 @@ Taches apache bsf optionelles pour %{name}. %package apache-resolver Summary: Optional apache resolver tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description apache-resolver Optional apache resolver tasks for %{name}. @@ -164,7 +163,7 @@ Taches apache resolver optionelles pour %{name}. %package commons-logging Summary: Optional commons logging tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description commons-logging Optional commons logging tasks for %{name}. @@ -174,7 +173,7 @@ Taches commons logging optionelles pour %{name}. %package commons-net Summary: Optional commons net tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description commons-net Optional commons net tasks for %{name}. @@ -186,7 +185,7 @@ Taches commons net optionelles pour %{name}. %package apache-bcel Summary: Optional apache bcel tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description apache-bcel Optional apache bcel tasks for %{name}. @@ -196,7 +195,7 @@ Taches apache bcel optionelles pour %{name}. %package apache-log4j Summary: Optional apache log4j tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description apache-log4j Optional apache log4j tasks for %{name}. @@ -206,7 +205,7 @@ Taches apache log4j optionelles pour %{name}. %package apache-oro Summary: Optional apache oro tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description apache-oro Optional apache oro tasks for %{name}. @@ -216,7 +215,7 @@ Taches apache oro optionelles pour %{name}. %package apache-regexp Summary: Optional apache regexp tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description apache-regexp Optional apache regexp tasks for %{name}. @@ -226,7 +225,7 @@ Taches apache regexp optionelles pour %{name}. %package apache-xalan2 Summary: Optional apache xalan2 tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description apache-xalan2 Optional apache xalan2 tasks for %{name}. @@ -236,7 +235,7 @@ Taches apache xalan2 optionelles pour %{name}. %package javamail Summary: Optional javamail tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description javamail Optional javamail tasks for %{name}. @@ -246,7 +245,7 @@ Taches javamail optionelles pour %{name}. %package jdepend Summary: Optional jdepend tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description jdepend Optional jdepend tasks for %{name}. @@ -256,7 +255,7 @@ Taches jdepend optionelles pour %{name}. %package jsch Summary: Optional jsch tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description jsch Optional jsch tasks for %{name}. @@ -266,7 +265,7 @@ Taches jsch optionelles pour %{name}. %package junit Summary: Optional junit tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description junit Optional junit tasks for %{name}. @@ -277,14 +276,14 @@ Taches junit optionelles pour %{name}. %package testutil Summary: Test utility classes for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description testutil Test utility tasks for %{name}. %package xz Summary: Optional xz tasks for %{name} -Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name} = %{version}-%{release} %description xz Optional xz tasks for %{name}. From b7dcde0b3e73b257f69717cf75285807f409fbc0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 10 Apr 2019 16:05:46 +0200 Subject: [PATCH 03/15] Re-add support for junit5 --- ant.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/ant.spec b/ant.spec index 5fe8332..d397d04 100644 --- a/ant.spec +++ b/ant.spec @@ -28,9 +28,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # - -# Disabled for now, asi it doesn't work (tests fail) and nobody needs it - %global ant_home %{_datadir}/ant Name: ant @@ -72,6 +69,7 @@ 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. @@ -273,6 +271,15 @@ 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} @@ -328,7 +335,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 @@ -351,8 +358,6 @@ mv LICENSE.utf8 LICENSE # We want a hard dep on antlr %pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml -%pom_xpath_inject 'target[@name="javadocs"]/javadoc/packageset' '' build.xml - %build %{ant} jars test-jar @@ -365,7 +370,6 @@ 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 -rm -f build/lib/ant-junitlauncher.jar # ----------------------------------------------------------------------------- %install @@ -445,10 +449,10 @@ 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 - # javadoc mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} @@ -566,6 +570,9 @@ LC_ALL=en_US.utf8 %{ant} test %{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 From 426d9cd7785b5a902d7b28aa1aa88f72eb494b0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 19 Nov 2018 22:33:42 +0100 Subject: [PATCH 04/15] Use C.UTF-8 locale --- ant.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ant.spec b/ant.spec index d397d04..8d32f15 100644 --- a/ant.spec +++ b/ant.spec @@ -32,7 +32,7 @@ Name: ant Version: 1.10.5 -Release: 1%{?dist} +Release: 3%{?dist} Summary: Java build tool Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java @@ -465,7 +465,7 @@ install -d -m 755 %{buildroot}%{_mandir}/man1/ install -p -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %check -LC_ALL=en_US.utf8 %{ant} test +LC_ALL=C.UTF-8 %{ant} test %files %doc KEYS README WHATSNEW @@ -593,6 +593,13 @@ LC_ALL=en_US.utf8 %{ant} test # ----------------------------------------------------------------------------- %changelog +* Mon Nov 19 2018 Zbigniew Jędrzejewski-Szmek - 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 - 0:1.10.5-2 +- Enable building the optional junit5 module + * Thu Aug 02 2018 Michael Simacek - 0:1.10.5-1 - Update to upstream version 1.10.5 From ba62f038dfd571f4f5b7bca9567016c52da01e3c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 May 2019 10:33:31 +0200 Subject: [PATCH 05/15] Update to upstream version 1.10.6 --- .gitignore | 1 + ant.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b9ed924..775b713 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ apache-ant-1.8.4-src.tar.bz2 /apache-ant-1.10.3-src.tar.bz2 /apache-ant-1.10.4-src.tar.bz2 /apache-ant-1.10.5-src.tar.bz2 +/apache-ant-1.10.6-src.tar.bz2 diff --git a/ant.spec b/ant.spec index 8d32f15..e7009e7 100644 --- a/ant.spec +++ b/ant.spec @@ -31,8 +31,8 @@ %global ant_home %{_datadir}/ant Name: ant -Version: 1.10.5 -Release: 3%{?dist} +Version: 1.10.6 +Release: 1%{?dist} Summary: Java build tool Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java @@ -593,6 +593,9 @@ LC_ALL=C.UTF-8 %{ant} test # ----------------------------------------------------------------------------- %changelog +* Wed May 08 2019 Mikolaj Izdebski - 1.10.6-1 +- Update to upstream version 1.10.6 + * Mon Nov 19 2018 Zbigniew Jędrzejewski-Szmek - 0:1.10.5-3 - Use C.UTF-8 locale See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot diff --git a/sources b/sources index 646a731..9a4a12f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-ant-1.10.5-src.tar.bz2) = 082dad03db4fb09b36560bd5e1fbd53f456eecad06d95140569661b6509861bb9b87b87843ef2f30a5de18c549dd993209aa17b47ac77d450f573309a272950e +SHA512 (apache-ant-1.10.6-src.tar.bz2) = 94c5cfc280f0ba416b1a777e19474648c493c61c7c322044926f10cc72c210079247fa9066044f74b3bf463240aed1884066bd3e698136d94df419271820f696 From 4f629929c9c1b17ed1b6f58782e09d30333b6431 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 8 May 2019 14:41:58 +0200 Subject: [PATCH 06/15] Add imageio subpackage --- ant.spec | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ant.spec b/ant.spec index e7009e7..446c956 100644 --- a/ant.spec +++ b/ant.spec @@ -231,6 +231,13 @@ 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} @@ -444,6 +451,7 @@ 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 @@ -545,6 +553,10 @@ LC_ALL=C.UTF-8 %{ant} test %{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 From 1d2640ee4de898a2fd1dcd1c8fda748b15f4ab61 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 22 May 2019 09:33:29 +0200 Subject: [PATCH 07/15] Expand macros in java-devel Recommends --- ant.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ant.spec b/ant.spec index 446c956..5b7d8e9 100644 --- a/ant.spec +++ b/ant.spec @@ -73,7 +73,7 @@ BuildRequires: junit5 # Theoretically Ant might be usable with just JRE, but typical Ant # workflow requires full JDK, so we recommend it here. -%{?fedora:Recommends}%{!?fedora:Requires}: java-devel >= 1:1.8.0 +Recommends: java-devel >= 1:1.8.0 Requires: %{name}-lib = %{version}-%{release} # Require full javapackages-tools since the ant script uses From efae49cedf51bc0e4a91f912edba852de8313e80 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:12 +0200 Subject: [PATCH 08/15] Mass rebuild for javapackages-tools 201901 --- ant.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ant.spec b/ant.spec index 5b7d8e9..7e2b72f 100644 --- a/ant.spec +++ b/ant.spec @@ -32,7 +32,7 @@ Name: ant Version: 1.10.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java build tool Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java @@ -605,6 +605,9 @@ LC_ALL=C.UTF-8 %{ant} test # ----------------------------------------------------------------------------- %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.10.6-2 +- Mass rebuild for javapackages-tools 201901 + * Wed May 08 2019 Mikolaj Izdebski - 1.10.6-1 - Update to upstream version 1.10.6 From ece89f16d2e31c05cd99b5f069e84e6b36236a3e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 19 Aug 2019 12:11:06 +0200 Subject: [PATCH 09/15] Don't use Recommends on RHEL 7 --- ant.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ant.spec b/ant.spec index 7e2b72f..008beea 100644 --- a/ant.spec +++ b/ant.spec @@ -73,7 +73,11 @@ 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 Recommends: java-devel >= 1:1.8.0 +%else +Requires: java-devel >= 1:1.8.0 +%endif Requires: %{name}-lib = %{version}-%{release} # Require full javapackages-tools since the ant script uses From 244947ee88c8d87213a8d2f00f04bd42caf53e84 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2019 10:55:57 +0200 Subject: [PATCH 10/15] Use en_US.UTF-8 locale on RHEL 7 --- ant.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ant.spec b/ant.spec index 008beea..2324588 100644 --- a/ant.spec +++ b/ant.spec @@ -477,7 +477,10 @@ install -d -m 755 %{buildroot}%{_mandir}/man1/ install -p -m 644 man/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1 %check -LC_ALL=C.UTF-8 %{ant} test +%if 0%{?rhel} && 0%{?rhel} <= 7 +export LC_ALL=en_US.UTF-8 +%endif +%{ant} test %files %doc KEYS README WHATSNEW From 91474899f5c630b7b8562bec4f407c86fc0d66c8 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Wed, 16 Oct 2019 17:40:50 +0200 Subject: [PATCH 11/15] Update to upstream version 1.10.7 --- .gitignore | 1 + ant.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 775b713..a2863ea 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ apache-ant-1.8.4-src.tar.bz2 /apache-ant-1.10.4-src.tar.bz2 /apache-ant-1.10.5-src.tar.bz2 /apache-ant-1.10.6-src.tar.bz2 +/apache-ant-1.10.7-src.tar.bz2 diff --git a/ant.spec b/ant.spec index 2324588..c9c612f 100644 --- a/ant.spec +++ b/ant.spec @@ -31,8 +31,8 @@ %global ant_home %{_datadir}/ant Name: ant -Version: 1.10.6 -Release: 2%{?dist} +Version: 1.10.7 +Release: 1%{?dist} Summary: Java build tool Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java @@ -612,6 +612,9 @@ export LC_ALL=en_US.UTF-8 # ----------------------------------------------------------------------------- %changelog +* Wed Oct 16 2019 Marian Koncek - 1.10.7-1 +- Update to upstream version 1.10.7 + * Fri May 24 2019 Mikolaj Izdebski - 1.10.6-2 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 9a4a12f..7a26dfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (apache-ant-1.10.6-src.tar.bz2) = 94c5cfc280f0ba416b1a777e19474648c493c61c7c322044926f10cc72c210079247fa9066044f74b3bf463240aed1884066bd3e698136d94df419271820f696 +SHA512 (apache-ant-1.10.7-src.tar.bz2) = 5849e81aa037b9ba7f4e67057a0cde50301d183fc244673c7f11e34997b11d21c33306c07ab820bf60d454afa8ad5b159c3442427c8cb5403896f29ed179b10d From 4423548e42792139f58838491a2c16699c3204dc Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 17 Oct 2019 10:43:49 +0200 Subject: [PATCH 12/15] Use our own version of javamail --- ant.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ant.spec b/ant.spec index c9c612f..f0768af 100644 --- a/ant.spec +++ b/ant.spec @@ -338,6 +338,10 @@ Javadoc pour %{name}. # 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 \ From fe0c89c29f8b2d63a315b41e26aea67d95958e58 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 31 Oct 2019 14:11:30 +0100 Subject: [PATCH 13/15] Fix javadoc generation on JDK 11 --- ant-build.xml.patch | 46 +++++++++++++++++++++++++++++++++++++++++++++ ant.spec | 10 ++++------ 2 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 ant-build.xml.patch diff --git a/ant-build.xml.patch b/ant-build.xml.patch new file mode 100644 index 0000000..948808c --- /dev/null +++ b/ant-build.xml.patch @@ -0,0 +1,46 @@ +--- 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 @@ + --> + + +- +- + + + + diff --git a/ant.spec b/ant.spec index f0768af..07ed13e 100644 --- a/ant.spec +++ b/ant.spec @@ -43,6 +43,8 @@ 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 @@ -331,9 +333,7 @@ Javadoc pour %{name}. %prep %setup -q -n apache-ant-%{version} - -# Fix class-path-in-manifest rpmlint warning -%pom_xpath_remove 'attribute[@name="Class-Path"]' build.xml +%patch0 -p1 # clean jar files find . -name "*.jar" | xargs -t rm @@ -374,9 +374,7 @@ mv LICENSE.utf8 LICENSE %pom_xpath_remove pom:optional src/etc/poms/ant-antlr/pom.xml %build -%{ant} jars test-jar - -%{ant} javadocs +%{ant} jars test-jar javadocs # typeset the manpage mkdir man From 29602300f37b85369ddb70c959051f580af76166 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 14/15] Mass rebuild for javapackages-tools 201902 --- ant.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ant.spec b/ant.spec index 07ed13e..340189b 100644 --- a/ant.spec +++ b/ant.spec @@ -32,7 +32,7 @@ Name: ant Version: 1.10.7 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java build tool Summary(it): Tool per la compilazione di programmi java Summary(fr): Outil de compilation pour java @@ -614,6 +614,9 @@ export LC_ALL=en_US.UTF-8 # ----------------------------------------------------------------------------- %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.10.7-2 +- Mass rebuild for javapackages-tools 201902 + * Wed Oct 16 2019 Marian Koncek - 1.10.7-1 - Update to upstream version 1.10.7 From cadd578eea70817b735e7a8a3fdbe0861d4c6bd3 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 7 Nov 2019 19:20:51 +0100 Subject: [PATCH 15/15] Use C.UTF-8 locale during check --- ant.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ant.spec b/ant.spec index 340189b..df70ff5 100644 --- a/ant.spec +++ b/ant.spec @@ -479,9 +479,7 @@ 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 -%endif +export LC_ALL=C.UTF-8 %{ant} test %files