[java-sig-commits] [ant] Use apache-commons-* instead of jakarta-commons-*.

[Alexander Kurtakov]

commit 7399143ab839eca8bae5b754e6c9253a4ba1d086
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed May 2 19:24:06 2012 +0300

    Use apache-commons-* instead of jakarta-commons-*.
    
    - Drop xml-commons-apis-13 BR/R since it's no longer needed.

 ant.spec |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/ant.spec b/ant.spec
index 6e895e8..20a09ea 100644
--- a/ant.spec
+++ b/ant.spec
@@ -49,7 +49,7 @@
 
 Name:           ant
 Version:        1.8.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          0
 Summary:        Build tool for java
 Summary(it):    Tool per la compilazione di programmi java
@@ -67,11 +67,9 @@ Patch4:         apache-ant-class-path-in-manifest.patch
 
 BuildRequires:  jpackage-utils >= 0:1.7.5
 BuildRequires:  java-devel >= 0:1.5.0
-BuildRequires:  jaxp_transform_impl
 %if %without bootstrap
 BuildRequires:  ant
 BuildRequires:  junit
-BuildRequires:  xml-commons-jaxp-1.3-apis
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 %endif
@@ -80,7 +78,6 @@ Requires:       jpackage-utils >= 0:1.7.5
 Requires:       java-devel >= 0:1.5.0
 %if %without bootstrap
 Requires:       xerces-j2
-Requires:       xml-commons-jaxp-1.3-apis
 %endif
 
 BuildArch:      noarch
@@ -198,8 +195,8 @@ Taches apache resolver optionelles pour %{name}.
 Summary:        Optional commons logging tasks for %{name}
 Group:          Development/Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jakarta-commons-logging
-BuildRequires:  jakarta-commons-logging
+Requires:       apache-commons-logging
+BuildRequires:  apache-commons-logging
 Provides:       ant-commons-logging = %{epoch}:%{version}-%{release}
 
 %description commons-logging
@@ -212,8 +209,8 @@ Taches commons logging optionelles pour %{name}.
 Summary:        Optional commons net tasks for %{name}
 Group:          Development/Tools
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jakarta-commons-net
-BuildRequires:  jakarta-commons-net
+Requires:       apache-commons-net
+BuildRequires:  apache-commons-net
 Provides:       ant-commons-net = %{epoch}:%{version}-%{release}
 
 %description commons-net
@@ -444,7 +441,7 @@ find . -name "*.jar" | %{_bindir}/xargs -t rm
 
 #install jars
 %if %without bootstrap
-build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver
+build-jar-repository -s -p lib/optional xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver
 %endif
 
 # Fix file-not-utf8 rpmlint warning
@@ -457,7 +454,7 @@ mv LICENSE.utf8 LICENSE
 %if %without bootstrap
 %{ant} jars test-jar
 %if %{build_javadoc}
-export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
+export CLASSPATH=$(build-classpath xerces-j2 antlr bcel javamail/mailapi jdepend junit log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver)
 %{ant} javadocs
 %endif
 %else
@@ -543,8 +540,8 @@ echo "ant/ant-swing" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/swing
 echo "antlr ant/ant-antlr" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/antlr
 echo "bsf ant/ant-apache-bsf" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bsf
 echo "xml-commons-resolver ant/ant-apache-resolver" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-resolver
-echo "jakarta-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
-echo "jakarta-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
+echo "apache-commons-logging ant/ant-commons-logging" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-logging
+echo "apache-commons-net ant/ant-commons-net" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/commons-net
 #echo "jai ant/ant-jai" > $RPM_BUILD_ROOT%%{_sysconfdir}/%%{name}.d/jai
 echo "bcel ant/ant-apache-bcel" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-bcel
 echo "log4j ant/ant-apache-log4j" > $RPM_BUILD_ROOT%{_sysconfdir}/%{name}.d/apache-log4j
@@ -741,6 +738,10 @@ find $RPM_BUILD_ROOT%{_datadir}/ant/etc -type f -name "*.xsl" \
 # -----------------------------------------------------------------------------
 
 %changelog
+* Wed May 2 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.8.3-2
+- Use apache-commons-* instead of jakarta-commons-*.
+- Drop xml-commons-apis-13 BR/R since it's no longer needed.
+
 * Wed Feb 29 2012 Alexander Kurtakov <akurtako at redhat.com> 0:1.8.3-1
 - Update to upstream 1.8.3 release.
 - Drop old stuff.