Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2013-09-11 13:39:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ant (Old) and /work/SRC/openSUSE:Factory/.ant.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant" Changes: -------- --- /work/SRC/openSUSE:Factory/ant/ant-antlr.changes 2011-12-15 16:05:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2013-09-11 13:39:41.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Sep 9 11:31:21 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/ant/ant.changes 2013-01-08 13:32:41.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ant.new/ant.changes 2013-09-11 13:39:41.000000000 +0200 @@ -1,0 +2,36 @@ +Mon Sep 9 11:05:25 UTC 2013 - [email protected] + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Thu Aug 22 07:47:26 UTC 2013 - [email protected] + +- Update to 1.9.2 +- Incompatible changes: + * ProjectHelper's implementation import and include tasks + defaults the targetPrefix to ProjectHelper.USE_PROJECT_NAME_AS_TARGET_PREFIX. + ProjectHelper2 is not affected, apache#54940. + * FixCRLF used to treat the EOL value ASIS to convert to the system property + line.separator. Specified was that ASIS would leave the EOL characters alone, + the task now really leaves the EOL characters alone. This also implies that + EOL ASIS will not insert a newline even if fixlast is set to true. + apache#53036 + * The CommandLauncher hierarchy that used to be a set of inner + classes of Execute has been extracted to the + org.apache.tools.ant.taskdefs.launcher package. + * Any FileResource whose represented File has a parent also has a basedir. + * Removing the Perforce Ant tasks replaced by tasks supplied by Perforce Inc. + * Setting the default encoding of StringResource to UTF-8 instead of null +- Bugfixes: + * <javadoc> post-process generated docs to migitiate frame + injection attack (CVE-2013-1571) apache#55132 + * Parsing of zip64 extra fields has become more lenient + * TarInputStream should now properly read GNU longlink entries' names. + apache#55040. + * <java> and <exec> used to be too restrictive when evaluating + whether a given set of options is compatible with spawning the new + process, apache#55112. + * Corrected XSLTC error in <junitreport>, apache#54641. + * and many more, see WHATSNEW for details + +------------------------------------------------------------------- Old: ---- apache-ant-1.8.2-src.tar.bz2 New: ---- apache-ant-1.9.2-src.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.QjgQgq/_old 2013-09-11 13:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.QjgQgq/_new 2013-09-11 13:39:42.000000000 +0200 @@ -38,23 +38,22 @@ %global ant_home %{_datadir}/ant -%global major_version 1.8 -%global cvs_version 1.8.2 +%global major_version 1.9 +%global cvs_version 1.9.2 Name: ant-antlr -Version: 1.8.2 +Version: 1.9.2 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Url: http://ant.apache.org/ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 -Source2: apache-ant-%{major_version}.ant.conf +Source1: apache-ant-1.8.ant.conf Source1000: pre_checkin.sh -Patch1: apache-ant-bz163689.patch -Patch3: apache-ant-no-test-jar.patch -Patch4: apache-ant-class-path-in-manifest.patch +Patch0: apache-ant-no-test-jar.patch +Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap BuildRequires: java-1_5_0-gcj-compat-devel @@ -64,14 +63,14 @@ BuildRequires: java-devel >= 1.5.0 %endif BuildRequires: antlr-bootstrap -BuildRequires: jpackage-utils >= 1.7.5 +BuildRequires: javapackages-tools BuildRequires: unzip #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap BuildRequires: ant = %{version} -BuildRequires: junit +BuildRequires: junit4 BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -79,8 +78,8 @@ %endif %if %bootstrap Requires: java-devel >= 1.5.0 +Requires: javapackages-tools Requires: jaxp_parser_impl -Requires: jpackage-utils >= 1.7.5 #Requires: xerces-j2 >= 2.7.1-2 Requires: xml-commons-apis Requires: xml-commons-resolver @@ -404,7 +403,7 @@ Summary: Optional junit tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: junit +Requires: junit4 Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-junit = %{version} @@ -417,7 +416,7 @@ Summary: Test utility classes for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: junit +Requires: junit4 Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-testutil = %{version} @@ -456,30 +455,31 @@ %setup -q -n apache-ant-%{cvs_version} #Fixup version find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// -#https://issues.apache.org/bugzilla/show_bug.cgi?id=47669 -sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java - -# Fix some places where copies of classes are included in the wrong jarfiles - -# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689). -%ifarch ppc64 s390x -%patch1 -p1 -b .sav1 -%endif # When bootstrapping, we don't have junit %if %bootstrap -%patch3 -p1 +%patch0 -p1 %endif # Fix class-path-in-manifest rpmlint warning -%patch4 +%patch1 # clean jar files -%{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t rm +%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm + +# 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 \ + src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \ + src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ + src/tests/junit/org/apache/tools/mail/MailMessageTest.java + +#FIXME: need newer junit4 package +rm src/tests/junit/org/example/junit/JUnit4Skippable.java #install jars %if ! %bootstrap -build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap 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 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver %endif # Fix file-not-utf8 rpmlint warning @@ -487,34 +487,20 @@ mv KEYS.utf8 KEYS iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8 mv LICENSE.utf8 LICENSE - -# Provides: exclude perl(oata), perl(examples) -cat <<__EOF__ > %{name}-perl.prov -#!/bin/sh -/usr/lib/rpm/perl.prov \$* | grep -v '^perl(oata)$' | grep -v '^perl(examples)$' -__EOF__ -%define __perl_provides %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.prov -chmod +x %{__perl_provides} - -# Requires: exclude bogus perl(the) -cat <<__EOF__ > %{name}-perl.req -#!/bin/sh -/usr/lib/rpm/perl.req \$* | grep -v '^perl(the)$' -__EOF__ -%define __perl_requires %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.req -chmod +x %{__perl_requires} - # ----------------------------------------------------------------------------- %build export OPT_JAR_LIST=: %if ! %bootstrap -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) -%{ant} -Dbuild.sysclasspath=first dist-lite +%{ant} -Dbuild.sysclasspath=first jars test-jar + +#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. +rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar %if 0%{?build_javadoc} -%{ant} dist_javadocs +export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) +%{ant} javadocs %endif %else @@ -532,7 +518,7 @@ mkdir -p %{buildroot}%{ant_home}/{lib,etc} # jars install -d -m 755 %{buildroot}%{_javadir}/ant -install -d -m 755 %{buildroot}%{_datadir}/maven2/poms +install -d -m 755 %{buildroot}%{_mavenpomdir} for jar in build/lib/*.jar do @@ -549,37 +535,43 @@ continue %endif ;; -#Bootstracp builds an incomplete ant-junit, don't ship it + ant-jmf|ant-swing) %if %bootstrap - ant-junit) continue;; + destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; %else - ant-jmf|ant-swing) continue;; + continue %endif + ;; +#Bootstracp builds an incomplete ant-foo jars, don't ship them + *) +%if %bootstrap + continue +%else #These go into %%{_javadir}/ant - *) destdir=%{buildroot}%{_javadir}/ant; destname="/ant"; + destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; +%endif + ;; esac #instal jar install -m 644 ${jar} ${destdir}/${jarname}.jar # jar aliases - ln -sf ../../java${destname}/${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar + ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar #bootstrap does not have a pom [ $jarname == ant-bootstrap ] && continue #install pom - install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}%{_datadir}/maven2/poms/${pomname} - %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname} + install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} + echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" + %add_maven_depmap ${pomname} ${destname}${jarname}.jar done %if %bootstrap -# add backward compatibility for nodeps jar that is now part of -# main jar -%add_to_maven_depmap org.apache.ant ant-nodeps %{version} JPP ant - #ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-ant-parent.pom -%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent +install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom +# % add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent +%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -600,7 +592,7 @@ %if %bootstrap # default ant.conf mkdir -p %{buildroot}%{_sysconfdir} -cp -p %{SOURCE2} %{buildroot}%{_sysconfdir}/ant.conf +cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf # OPT_JAR_LIST fragments mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d @@ -636,7 +628,7 @@ %if 0%{?build_javadoc} # fix link between manual and javadoc -(cd docs/manual; ln -sf %{_javadocdir}/%{name} api) +(cd manual; ln -sf %{_javadocdir}/%{name} api) %endif #javadoc %if %bootstrap @@ -651,12 +643,6 @@ | xargs -t rm %endif -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %if %bootstrap %files @@ -686,13 +672,11 @@ %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -# % {_datadir}/maven2/poms/* -%{_datadir}/maven2/poms/JPP-ant-launcher.pom -%{_datadir}/maven2/poms/JPP-ant-parent.pom -%{_datadir}/maven2/poms/JPP-ant.pom +%{_mavenpomdir}/JPP-ant-launcher.pom +%{_mavenpomdir}/JPP-ant-parent.pom +%{_mavenpomdir}/JPP-ant.pom %config(noreplace) %{_mavendepmapfragdir}/* -%dir %{_datadir}/maven2 -%dir %{_datadir}/maven2/poms +%dir %{_mavenpomdir} %else # ant-antlr filelist @@ -702,10 +686,9 @@ %{_javadir}/ant/ant-antlr.jar %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr -%{_datadir}/maven2/poms/JPP.ant-ant-antlr.pom +%{_mavenpomdir}/JPP.ant-ant-antlr.pom %config %{_mavendepmapfragdir}/ant-antlr -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%dir %{_mavenpomdir} %endif ### Basic ant subpackages @@ -716,14 +699,15 @@ %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_datadir}/maven2/poms/JPP.ant-ant-jmf.pom +%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing %defattr(0644,root,root,0755) %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -%{_datadir}/maven2/poms/JPP.ant-ant-swing.pom +%{_mavenpomdir}/JPP.ant-ant-swing.pom +%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755) @@ -738,36 +722,32 @@ %{_javadir}/ant/ant-apache-bsf.jar %{ant_home}/lib/ant-apache-bsf.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bsf -%{_datadir}/maven2/poms/JPP.ant-ant-apache-bsf.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-bsf.pom +%dir %{_mavenpomdir} %files -n ant-apache-resolver %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-resolver.jar %{ant_home}/lib/ant-apache-resolver.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-resolver -%{_datadir}/maven2/poms/JPP.ant-ant-apache-resolver.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-resolver.pom +%dir %{_mavenpomdir} %files -n ant-commons-logging %defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-logging.jar %{ant_home}/lib/ant-commons-logging.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-logging -%{_datadir}/maven2/poms/JPP.ant-ant-commons-logging.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-commons-logging.pom +%dir %{_mavenpomdir} %files -n ant-commons-net %defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-net.jar %{ant_home}/lib/ant-commons-net.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-net -%{_datadir}/maven2/poms/JPP.ant-ant-commons-net.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-commons-net.pom +%dir %{_mavenpomdir} # Disable as we dont ship the dependencies %if 0 @@ -783,18 +763,16 @@ %{_javadir}/ant/ant-apache-bcel.jar %{ant_home}/lib/ant-apache-bcel.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bcel -%{_datadir}/maven2/poms/JPP.ant-ant-apache-bcel.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-bcel.pom +%dir %{_mavenpomdir} %files -n ant-apache-log4j %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-log4j.jar %{ant_home}/lib/ant-apache-log4j.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-log4j -%{_datadir}/maven2/poms/JPP.ant-ant-apache-log4j.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-log4j.pom +%dir %{_mavenpomdir} %files -n ant-apache-oro %defattr(0644,root,root,0755) @@ -802,34 +780,32 @@ %{ant_home}/lib/ant-apache-oro.jar %{ant_home}/etc/maudit-frames.xsl %config(noreplace) %{_sysconfdir}/ant.d/apache-oro -%{_datadir}/maven2/poms/JPP.ant-ant-apache-oro.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-oro.pom +%dir %{_mavenpomdir} %files -n ant-apache-regexp %defattr(-,root,root,-) %{_javadir}/ant/ant-apache-regexp.jar %{ant_home}/lib/ant-apache-regexp.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-regexp -%{_datadir}/maven2/poms/JPP.ant-ant-apache-regexp.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-regexp.pom +%dir %{_mavenpomdir} %files -n ant-apache-xalan2 %defattr(-,root,root,-) %{_javadir}/ant/ant-apache-xalan2.jar %{ant_home}/lib/ant-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 -%{_datadir}/maven2/poms/JPP.ant-ant-apache-xalan2.pom +%{_mavenpomdir}/JPP.ant-ant-apache-xalan2.pom +%dir %{_mavenpomdir} %files -n ant-javamail %defattr(0644,root,root,0755) %{_javadir}/ant/ant-javamail.jar %{ant_home}/lib/ant-javamail.jar %config(noreplace) %{_sysconfdir}/ant.d/javamail -%{_datadir}/maven2/poms/JPP.ant-ant-javamail.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-javamail.pom +%dir %{_mavenpomdir} %files -n ant-jdepend %defattr(0644,root,root,0755) @@ -838,42 +814,38 @@ %config(noreplace) %{_sysconfdir}/ant.d/jdepend %{ant_home}/etc/jdepend.xsl %{ant_home}/etc/jdepend-frames.xsl -%{_datadir}/maven2/poms/JPP.ant-ant-jdepend.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-jdepend.pom +%dir %{_mavenpomdir} %files -n ant-jsch %defattr(0644,root,root,0755) %{_javadir}/ant/ant-jsch.jar %{ant_home}/lib/ant-jsch.jar %config(noreplace) %{_sysconfdir}/ant.d/jsch -%{_datadir}/maven2/poms/JPP.ant-ant-jsch.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-jsch.pom +%dir %{_mavenpomdir} %files -n ant-junit %defattr(0644,root,root,0755) -%{_javadir}/ant/ant-junit.jar -%{ant_home}/lib/ant-junit.jar +%{_javadir}/ant/ant-junit*.jar +%{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl -%{_datadir}/maven2/poms/JPP.ant-ant-junit.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-junit*.pom +%dir %{_mavenpomdir} %files -n ant-testutil %defattr(-,root,root,-) %{_javadir}/ant/ant-testutil.jar %{ant_home}/lib/ant-testutil.jar %config(noreplace) %{_sysconfdir}/ant.d/testutil -%{_datadir}/maven2/poms/JPP.ant-ant-testutil.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-testutil.pom +%dir %{_mavenpomdir} %files -n ant-manual %defattr(0644,root,root,0755) -%doc docs/* +%doc manual/* %if 0%{?build_javadoc} ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.QjgQgq/_old 2013-09-11 13:39:42.000000000 +0200 +++ /var/tmp/diff_new_pack.QjgQgq/_new 2013-09-11 13:39:42.000000000 +0200 @@ -37,23 +37,22 @@ %global ant_home %{_datadir}/ant -%global major_version 1.8 -%global cvs_version 1.8.2 +%global major_version 1.9 +%global cvs_version 1.9.2 Name: ant -Version: 1.8.2 +Version: 1.9.2 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 Group: Development/Tools/Building Url: http://ant.apache.org/ Source0: http://www.apache.org/dist/ant/source/apache-ant-%{cvs_version}-src.tar.bz2 -Source2: apache-ant-%{major_version}.ant.conf +Source1: apache-ant-1.8.ant.conf Source1000: pre_checkin.sh -Patch1: apache-ant-bz163689.patch -Patch3: apache-ant-no-test-jar.patch -Patch4: apache-ant-class-path-in-manifest.patch +Patch0: apache-ant-no-test-jar.patch +Patch1: apache-ant-class-path-in-manifest.patch %if %bootstrap BuildRequires: java-1_5_0-gcj-compat-devel @@ -63,14 +62,14 @@ BuildRequires: java-devel >= 1.5.0 %endif BuildRequires: antlr-bootstrap -BuildRequires: jpackage-utils >= 1.7.5 +BuildRequires: javapackages-tools BuildRequires: unzip #BuildRequires: xerces-j2-bootstrap #!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap BuildRequires: ant = %{version} -BuildRequires: junit +BuildRequires: junit4 BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -78,8 +77,8 @@ %endif %if %bootstrap Requires: java-devel >= 1.5.0 +Requires: javapackages-tools Requires: jaxp_parser_impl -Requires: jpackage-utils >= 1.7.5 #Requires: xerces-j2 >= 2.7.1-2 Requires: xml-commons-apis Requires: xml-commons-resolver @@ -403,7 +402,7 @@ Summary: Optional junit tasks for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: junit +Requires: junit4 Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-junit = %{version} @@ -416,7 +415,7 @@ Summary: Test utility classes for ant License: Apache-2.0 Group: Development/Tools/Building -Requires: junit +Requires: junit4 Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Provides: ant-testutil = %{version} @@ -455,30 +454,31 @@ %setup -q -n apache-ant-%{cvs_version} #Fixup version find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT// -#https://issues.apache.org/bugzilla/show_bug.cgi?id=47669 -sed -i -e "s|IMAGE_FILE_TYPE|BINARY_FILE_TYPE|g" src/main/org/apache/tools/ant/taskdefs/optional/net/FTP.java - -# Fix some places where copies of classes are included in the wrong jarfiles - -# Disable the style and xmlvalidate tasks on ppc64 and s390x (#163689). -%ifarch ppc64 s390x -%patch1 -p1 -b .sav1 -%endif # When bootstrapping, we don't have junit %if %bootstrap -%patch3 -p1 +%patch0 -p1 %endif # Fix class-path-in-manifest rpmlint warning -%patch4 +%patch1 # clean jar files -%{_bindir}/find -name "*.jar" | %{_bindir}/xargs -t rm +%{_bindir}/find . -name "*.jar" | %{_bindir}/xargs -t rm + +# 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 \ + src/tests/junit/org/apache/tools/ant/taskdefs/condition/IsSignedTest.java \ + src/tests/junit/org/apache/tools/ant/taskdefs/JarTest.java \ + src/tests/junit/org/apache/tools/mail/MailMessageTest.java + +#FIXME: need newer junit4 package +rm src/tests/junit/org/example/junit/JUnit4Skippable.java #install jars %if ! %bootstrap -build-jar-repository -s -p lib/optional xerces-j2 xml-commons-jaxp-1.3-apis antlr-bootstrap 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 xml-commons-jaxp-1.3-apis antlr-bootstrap bcel javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver %endif # Fix file-not-utf8 rpmlint warning @@ -486,34 +486,20 @@ mv KEYS.utf8 KEYS iconv LICENSE -f iso-8859-1 -t utf-8 -o LICENSE.utf8 mv LICENSE.utf8 LICENSE - -# Provides: exclude perl(oata), perl(examples) -cat <<__EOF__ > %{name}-perl.prov -#!/bin/sh -/usr/lib/rpm/perl.prov \$* | grep -v '^perl(oata)$' | grep -v '^perl(examples)$' -__EOF__ -%define __perl_provides %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.prov -chmod +x %{__perl_provides} - -# Requires: exclude bogus perl(the) -cat <<__EOF__ > %{name}-perl.req -#!/bin/sh -/usr/lib/rpm/perl.req \$* | grep -v '^perl(the)$' -__EOF__ -%define __perl_requires %{_builddir}/apache-ant-%{cvs_version}/%{name}-perl.req -chmod +x %{__perl_requires} - # ----------------------------------------------------------------------------- %build export OPT_JAR_LIST=: %if ! %bootstrap -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) -%{ant} -Dbuild.sysclasspath=first dist-lite +%{ant} -Dbuild.sysclasspath=first jars test-jar + +#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests. +rm -rf build/lib/ant-jai.jar build/lib/ant-netrexx.jar %if 0%{?build_javadoc} -%{ant} dist_javadocs +export CLASSPATH=$(build-classpath xerces-j2 xml-commons-jaxp-1.3-apis antlr bcel jaf javamail/mailapi jdepend junit4 log4j oro regexp bsf commons-logging commons-net jsch xalan-j2 xml-commons-resolver) +%{ant} javadocs %endif %else @@ -531,7 +517,7 @@ mkdir -p %{buildroot}%{ant_home}/{lib,etc} # jars install -d -m 755 %{buildroot}%{_javadir}/ant -install -d -m 755 %{buildroot}%{_datadir}/maven2/poms +install -d -m 755 %{buildroot}%{_mavenpomdir} for jar in build/lib/*.jar do @@ -548,37 +534,43 @@ continue %endif ;; -#Bootstracp builds an incomplete ant-junit, don't ship it + ant-jmf|ant-swing) %if %bootstrap - ant-junit) continue;; + destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; %else - ant-jmf|ant-swing) continue;; + continue %endif + ;; +#Bootstracp builds an incomplete ant-foo jars, don't ship them + *) +%if %bootstrap + continue +%else #These go into %%{_javadir}/ant - *) destdir=%{buildroot}%{_javadir}/ant; destname="/ant"; + destdir=%{buildroot}%{_javadir}/ant; destname="ant/"; +%endif + ;; esac #instal jar install -m 644 ${jar} ${destdir}/${jarname}.jar # jar aliases - ln -sf ../../java${destname}/${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar + ln -sf ../../java/${destname}${jarname}.jar %{buildroot}%{ant_home}/lib/${jarname}.jar #bootstrap does not have a pom [ $jarname == ant-bootstrap ] && continue #install pom - install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}%{_datadir}/maven2/poms/${pomname} - %add_to_maven_depmap org.apache.ant ${jarname} %{version} JPP${destname} ${jarname} + install -m 644 src/etc/poms/${jarname}/pom.xml %{buildroot}/%{_mavenpomdir}/${pomname} + echo %%add_maven_depmap "${pomname}" "${destname}${jarname}.jar" + %add_maven_depmap ${pomname} ${destname}${jarname}.jar done %if %bootstrap -# add backward compatibility for nodeps jar that is now part of -# main jar -%add_to_maven_depmap org.apache.ant ant-nodeps %{version} JPP ant - #ant-parent pom -install -m 644 src/etc/poms/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-ant-parent.pom -%add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent +install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom +# % add_to_maven_depmap org.apache.ant ant-parent %{version} JPP ant-parent +%add_maven_depmap JPP-ant-parent.pom # scripts: remove dos and os/2 scripts rm -f src/script/*.bat @@ -599,7 +591,7 @@ %if %bootstrap # default ant.conf mkdir -p %{buildroot}%{_sysconfdir} -cp -p %{SOURCE2} %{buildroot}%{_sysconfdir}/ant.conf +cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf # OPT_JAR_LIST fragments mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d @@ -635,7 +627,7 @@ %if 0%{?build_javadoc} # fix link between manual and javadoc -(cd docs/manual; ln -sf %{_javadocdir}/%{name} api) +(cd manual; ln -sf %{_javadocdir}/%{name} api) %endif #javadoc %if %bootstrap @@ -650,12 +642,6 @@ | xargs -t rm %endif -%post -%update_maven_depmap - -%postun -%update_maven_depmap - %if %bootstrap %files @@ -685,13 +671,11 @@ %{ant_home}/lib/ant-bootstrap.jar %{ant_home}/lib/ant-launcher.jar %dir %{_sysconfdir}/ant.d -# % {_datadir}/maven2/poms/* -%{_datadir}/maven2/poms/JPP-ant-launcher.pom -%{_datadir}/maven2/poms/JPP-ant-parent.pom -%{_datadir}/maven2/poms/JPP-ant.pom +%{_mavenpomdir}/JPP-ant-launcher.pom +%{_mavenpomdir}/JPP-ant-parent.pom +%{_mavenpomdir}/JPP-ant.pom %config(noreplace) %{_mavendepmapfragdir}/* -%dir %{_datadir}/maven2 -%dir %{_datadir}/maven2/poms +%dir %{_mavenpomdir} %else # ant-antlr filelist @@ -701,10 +685,9 @@ %{_javadir}/ant/ant-antlr.jar %{ant_home}/lib/ant-antlr.jar %config(noreplace) %{_sysconfdir}/ant.d/antlr -%{_datadir}/maven2/poms/JPP.ant-ant-antlr.pom +%{_mavenpomdir}/JPP.ant-ant-antlr.pom %config %{_mavendepmapfragdir}/ant-antlr -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%dir %{_mavenpomdir} %endif ### Basic ant subpackages @@ -715,14 +698,15 @@ %{_javadir}/ant/ant-jmf.jar %{ant_home}/lib/ant-jmf.jar %config(noreplace) %{_sysconfdir}/ant.d/jmf -%{_datadir}/maven2/poms/JPP.ant-ant-jmf.pom +%{_mavenpomdir}/JPP.ant-ant-jmf.pom %files -n ant-swing %defattr(0644,root,root,0755) %{_javadir}/ant/ant-swing.jar %{ant_home}/lib/ant-swing.jar %config(noreplace) %{_sysconfdir}/ant.d/swing -%{_datadir}/maven2/poms/JPP.ant-ant-swing.pom +%{_mavenpomdir}/JPP.ant-ant-swing.pom +%dir %{_mavenpomdir} %files -n ant-scripts %defattr(0755,root,root,0755) @@ -737,36 +721,32 @@ %{_javadir}/ant/ant-apache-bsf.jar %{ant_home}/lib/ant-apache-bsf.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bsf -%{_datadir}/maven2/poms/JPP.ant-ant-apache-bsf.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-bsf.pom +%dir %{_mavenpomdir} %files -n ant-apache-resolver %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-resolver.jar %{ant_home}/lib/ant-apache-resolver.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-resolver -%{_datadir}/maven2/poms/JPP.ant-ant-apache-resolver.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-resolver.pom +%dir %{_mavenpomdir} %files -n ant-commons-logging %defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-logging.jar %{ant_home}/lib/ant-commons-logging.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-logging -%{_datadir}/maven2/poms/JPP.ant-ant-commons-logging.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-commons-logging.pom +%dir %{_mavenpomdir} %files -n ant-commons-net %defattr(0644,root,root,0755) %{_javadir}/ant/ant-commons-net.jar %{ant_home}/lib/ant-commons-net.jar %config(noreplace) %{_sysconfdir}/ant.d/commons-net -%{_datadir}/maven2/poms/JPP.ant-ant-commons-net.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-commons-net.pom +%dir %{_mavenpomdir} # Disable as we dont ship the dependencies %if 0 @@ -782,18 +762,16 @@ %{_javadir}/ant/ant-apache-bcel.jar %{ant_home}/lib/ant-apache-bcel.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-bcel -%{_datadir}/maven2/poms/JPP.ant-ant-apache-bcel.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-bcel.pom +%dir %{_mavenpomdir} %files -n ant-apache-log4j %defattr(0644,root,root,0755) %{_javadir}/ant/ant-apache-log4j.jar %{ant_home}/lib/ant-apache-log4j.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-log4j -%{_datadir}/maven2/poms/JPP.ant-ant-apache-log4j.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-log4j.pom +%dir %{_mavenpomdir} %files -n ant-apache-oro %defattr(0644,root,root,0755) @@ -801,34 +779,32 @@ %{ant_home}/lib/ant-apache-oro.jar %{ant_home}/etc/maudit-frames.xsl %config(noreplace) %{_sysconfdir}/ant.d/apache-oro -%{_datadir}/maven2/poms/JPP.ant-ant-apache-oro.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-oro.pom +%dir %{_mavenpomdir} %files -n ant-apache-regexp %defattr(-,root,root,-) %{_javadir}/ant/ant-apache-regexp.jar %{ant_home}/lib/ant-apache-regexp.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-regexp -%{_datadir}/maven2/poms/JPP.ant-ant-apache-regexp.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-apache-regexp.pom +%dir %{_mavenpomdir} %files -n ant-apache-xalan2 %defattr(-,root,root,-) %{_javadir}/ant/ant-apache-xalan2.jar %{ant_home}/lib/ant-apache-xalan2.jar %config(noreplace) %{_sysconfdir}/ant.d/apache-xalan2 -%{_datadir}/maven2/poms/JPP.ant-ant-apache-xalan2.pom +%{_mavenpomdir}/JPP.ant-ant-apache-xalan2.pom +%dir %{_mavenpomdir} %files -n ant-javamail %defattr(0644,root,root,0755) %{_javadir}/ant/ant-javamail.jar %{ant_home}/lib/ant-javamail.jar %config(noreplace) %{_sysconfdir}/ant.d/javamail -%{_datadir}/maven2/poms/JPP.ant-ant-javamail.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-javamail.pom +%dir %{_mavenpomdir} %files -n ant-jdepend %defattr(0644,root,root,0755) @@ -837,42 +813,38 @@ %config(noreplace) %{_sysconfdir}/ant.d/jdepend %{ant_home}/etc/jdepend.xsl %{ant_home}/etc/jdepend-frames.xsl -%{_datadir}/maven2/poms/JPP.ant-ant-jdepend.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-jdepend.pom +%dir %{_mavenpomdir} %files -n ant-jsch %defattr(0644,root,root,0755) %{_javadir}/ant/ant-jsch.jar %{ant_home}/lib/ant-jsch.jar %config(noreplace) %{_sysconfdir}/ant.d/jsch -%{_datadir}/maven2/poms/JPP.ant-ant-jsch.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-jsch.pom +%dir %{_mavenpomdir} %files -n ant-junit %defattr(0644,root,root,0755) -%{_javadir}/ant/ant-junit.jar -%{ant_home}/lib/ant-junit.jar +%{_javadir}/ant/ant-junit*.jar +%{ant_home}/lib/ant-junit*.jar %config(noreplace) %{_sysconfdir}/ant.d/junit %{ant_home}/etc/junit-frames.xsl %{ant_home}/etc/junit-noframes.xsl -%{_datadir}/maven2/poms/JPP.ant-ant-junit.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-junit*.pom +%dir %{_mavenpomdir} %files -n ant-testutil %defattr(-,root,root,-) %{_javadir}/ant/ant-testutil.jar %{ant_home}/lib/ant-testutil.jar %config(noreplace) %{_sysconfdir}/ant.d/testutil -%{_datadir}/maven2/poms/JPP.ant-ant-testutil.pom -%dir %{_datadir}/maven2/ -%dir %{_datadir}/maven2/poms +%{_mavenpomdir}/JPP.ant-ant-testutil.pom +%dir %{_mavenpomdir} %files -n ant-manual %defattr(0644,root,root,0755) -%doc docs/* +%doc manual/* %if 0%{?build_javadoc} ++++++ apache-ant-1.8.2-src.tar.bz2 -> apache-ant-1.9.2-src.tar.bz2 ++++++ ++++ 795568 lines of diff (skipped) ++++++ apache-ant-class-path-in-manifest.patch ++++++ --- /var/tmp/diff_new_pack.QjgQgq/_old 2013-09-11 13:39:45.000000000 +0200 +++ /var/tmp/diff_new_pack.QjgQgq/_new 2013-09-11 13:39:45.000000000 +0200 @@ -1,15 +1,15 @@ ---- build.xml.orig 2010-12-28 14:45:24.000000000 +0200 -+++ build.xml 2010-12-28 14:46:40.843377673 +0200 -@@ -730,10 +730,10 @@ - <include name="LICENSE.txt"/> - <include name="NOTICE.txt"/> - </metainf> -- <manifest> -+ <!--manifest> - <attribute name="Class-Path" - value="ant.jar xalan.jar"/> -- </manifest> -+ </manifest--> - </jar> - - <macrodef name="optional-jar"> +Index: build.xml +=================================================================== +--- build.xml.orig ++++ build.xml +@@ -717,10 +717,6 @@ + <include name="LICENSE.txt"/> + <include name="NOTICE.txt"/> + </metainf> +- <manifest> +- <attribute name="Class-Path" +- value="ant.jar xalan.jar"/> +- </manifest> + </jar> + + <macrodef name="optional-jar"> ++++++ apache-ant-no-test-jar.patch ++++++ --- /var/tmp/diff_new_pack.QjgQgq/_old 2013-09-11 13:39:45.000000000 +0200 +++ /var/tmp/diff_new_pack.QjgQgq/_new 2013-09-11 13:39:45.000000000 +0200 @@ -1,13 +1,17 @@ -Index: apache-ant-1.8.0/build.xml +--- + build.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: apache-ant-1.9.2/build.xml =================================================================== ---- apache-ant-1.8.0.orig/build.xml 2010-04-13 14:09:27.501531982 +0200 -+++ apache-ant-1.8.0/build.xml 2010-04-13 14:57:08.321408006 +0200 -@@ -832,7 +832,7 @@ - =================================================================== - --> - <target name="dist-lite" -- depends="jars,test-jar" -+ depends="jars" - description="--> creates a minimum distribution to run Apache Ant"> - - <mkdir dir="${dist.dir}"/> +--- apache-ant-1.9.2.orig/build.xml ++++ apache-ant-1.9.2/build.xml +@@ -873,7 +873,7 @@ + =================================================================== + --> + <target name="dist-lite" +- depends="jars,test-jar" ++ depends="jars" + description="--> creates a minimum distribution to run Apache Ant"> + + <mkdir dir="${dist.dir}"/> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
