[java-sig-commits] [ant] Removed checking for classpath duplicates + ant-junit4.jar integration

[Tomas Radej]

commit ed545c2a6085fdcac0056c5903087518799cbaf0
Author: Tomas Radej <tradej at redhat.com>
Date:   Thu Feb 2 16:44:23 2012 +0100

    Removed checking for classpath duplicates + ant-junit4.jar integration

 ant.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 504a2ad..f76a640 100644
--- a/ant.spec
+++ b/ant.spec
@@ -50,7 +50,7 @@
 
 Name:           ant
 Version:        1.8.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:          0
 Summary:        Build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -65,6 +65,7 @@ Source2:        apache-ant-%{major_version}.ant.conf
 Patch1:         apache-ant-bz163689.patch
 Patch3:         apache-ant-no-test-jar.patch
 Patch4:         apache-ant-class-path-in-manifest.patch
+Patch5:         %{name}-classpath-check.patch
 
 BuildRequires:  jpackage-utils >= 0:1.7.5
 BuildRequires:  java-devel >= 0:1.5.0
@@ -442,6 +443,10 @@ sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/t
 # Fix class-path-in-manifest rpmlint warning
 %patch4
 
+# Removed checking for classpath duplicates (cause for BZ #755325)
+# Accepted in upstream, release pending
+%patch5 -p1
+
 # clean jar files
 find . -name "*.jar" | %{_bindir}/xargs -t rm
 
@@ -576,6 +581,7 @@ echo "javamail jaf ant/ant-javamail" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/j
 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 ant/ant-junit" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit
+echo "junit ant/ant-junit4" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/junit4
 echo "testutil ant/ant-testutil" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/testutil
 %endif
 
@@ -732,8 +738,11 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
 
 %files junit
 %{_javadir}/%{name}/%{name}-junit.jar
+%{_javadir}/%{name}/%{name}-junit4.jar
 %{ant_home}/lib/%{name}-junit.jar
+%{ant_home}/lib/%{name}-junit4.jar
 %config(noreplace) %{_sysconfdir}/%{name}.d/junit
+%config(noreplace) %{_sysconfdir}/%{name}.d/junit4
 %{ant_home}/etc/junit-frames.xsl
 %{ant_home}/etc/junit-noframes.xsl
 
@@ -758,6 +767,10 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
 # -----------------------------------------------------------------------------
 
 %changelog
+* Tue Feb 07 2012 Tomas Radej <tradej at redhat.com> - 0:1.8.2-8
+- Removed checking for classpath duplicates
+- Added ant-junit4.jar into %files and ant.d
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:1.8.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild