Hello community,
here is the log from the commit of package ant for openSUSE:Factory checked in at 2014-08-31 14:16:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ant (Old)
and /work/SRC/openSUSE:Factory/.ant.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ant"
Changes:
--------
New Changes file:
--- /dev/null 2014-07-24 01:57:42.080040256 +0200
+++ /work/SRC/openSUSE:Factory/.ant.new/ant-junit.changes 2014-08-31 14:16:12.000000000 +0200
@@ -0,0 +1,496 @@
+-------------------------------------------------------------------
+Thu Aug 28 14:30:48 UTC 2014 - coolo(a)suse.com
+
+- to bootstrap 13.2 we need another split because bsf depends on things
+ that depend on junit and as antlr requires bsf, we need a 3rd step ->
+ split ant-junit to build in between ant and ant-antlr
+
+-------------------------------------------------------------------
+Fri Jul 4 12:47:07 UTC 2014 - tchvatal(a)suse.com
+
+- Fix building on SLE.
+- Added patch:
+ * apache-ant-old-gcj-build.patch
+
+-------------------------------------------------------------------
+Fri Jul 4 11:54:48 UTC 2014 - tchvatal(a)suse.com
+
+- Update to 1.9.4:
+ * Read WHATSNEW file for full changelist
+ * initial support for Java 1.9
+ * <junit> has now a threads attribute allowing to run the tests in
+ several threads. Bugzilla Report 55925
+ * TarInputStream will now read archives created by tar
+ implementations that encode big numbers by not adding a trailing
+ NUL.
+
+-------------------------------------------------------------------
+Thu May 15 13:18:36 UTC 2014 - peter.trommler(a)ohm-hochschule.de
+
+- fix summary (was antlr summary)
+
+-------------------------------------------------------------------
+Mon May 12 14:00:55 UTC 2014 - darin(a)darins.net
+
+- SLE_11 specific spec files for ant/ant-antlr. These build with
+ openjdk, which introduced bootstrap breakage in Factory.
+- Update pre_checkin.sh for SLE_11 specific spec's
+
+-------------------------------------------------------------------
+Fri May 2 09:01:02 UTC 2014 - tchvatal(a)suse.com
+
+- Revert the bootstrap breakage.
+
+-------------------------------------------------------------------
+Thu Apr 24 09:54:12 UTC 2014 - dmueller(a)suse.com
+
+- remove dependency on gpg-offline (blocks rebuilds and
+ tarball integrity is checked by source-validator anyway, plus
+ it was commented out)
+- remove apache-ant-bz163689.patch (was not applied anywhere)
+
+-------------------------------------------------------------------
+Wed Apr 23 12:55:35 UTC 2014 - darin(a)darins.net
+
+- Update packaging to build the openjdk and not gcj
+
+-------------------------------------------------------------------
+Thu Jan 2 08:36:18 UTC 2014 - mvyskocil(a)suse.com
+
+- Update to 1.9.3
+- BugFixes:
+ * Ant 1.8 exec task changes have slowed exec to a crawl, apache#54128
+ * <parallel> swallowed the status code of nested <fail> tasks,
+ apache#55539
+ * a race condition could make <fixcrlf> tasks of parallel builds to
+ interfere with each other, apache#54393
+ * <mail>'s mailport still didn't work properly when using smtps,
+ apache#49267
+ * using attributes belonging to the if and unless namespaces
+ made macrodef fail, apache#55885.
+ * Apt is not available under JDK 1.8, apache#55922
+- drop unused macros
+- add gpg verification
+
+-------------------------------------------------------------------
+Wed Dec 4 14:58:13 UTC 2013 - mvyskocil(a)suse.com
+
+- use requires_eq instead of manual call of rpm -q
+
+-------------------------------------------------------------------
+Wed Oct 2 09:52:33 UTC 2013 - mvyskocil(a)suse.com
+
+- install compat symlink to /usr/share/ant/bin/antRun to make scala build
+
+-------------------------------------------------------------------
+Mon Sep 9 11:05:25 UTC 2013 - tchvatal(a)suse.com
+
+- Move from jpackage-utils to javapackage-tools
+
+-------------------------------------------------------------------
+Thu Aug 22 07:47:26 UTC 2013 - mvyskocil(a)suse.com
+
+- 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
+
+-------------------------------------------------------------------
+Mon Jan 7 12:15:09 UTC 2013 - mvyskocil(a)suse.com
+
+- remove xerces-j2-bootstrap depenency (bnc#789163)
+
+-------------------------------------------------------------------
+Wed May 30 11:46:44 UTC 2012 - cfarrell(a)suse.com
+
+- license update: CDDL-1.0
+ SPDX format (note that it should CDDL-1.1 if the (c) owner and license
+ steward is Oracle)
+
+-------------------------------------------------------------------
+Tue May 15 07:02:23 UTC 2012 - mvyskocil(a)suse.cz
+
+- build ignore java-1_7_0-openjdk as well
+
+-------------------------------------------------------------------
+Wed Feb 1 12:54:47 UTC 2012 - mvyskocil(a)suse.cz
+
+- revert the Recommends to fix a lot of build fails
+
+-------------------------------------------------------------------
+Wed Jan 25 09:54:17 UTC 2012 - mvyskocil(a)suse.cz
+
+- use new _mavendepmapfragdir macro instead of hardocded path
+- change java-devel Requires to Recommends
+
+-------------------------------------------------------------------
+Tue Jan 3 01:01:19 CET 2012 - dmueller(a)suse.de
+
+- use dist-lite and dist_javadocs to make javadoc build really
+ optional
+- fix arm check (ifarch does not work in a noarch spec file)
+
+-------------------------------------------------------------------
+Thu Dec 15 08:49:28 UTC 2011 - mvyskocil(a)suse.cz
+
+- use dist and javadocs targets to make javadoc build really configurable
+- disable javadoc build on arm to speedup the build of java platform
+
+-------------------------------------------------------------------
+Sat Sep 17 11:04:48 UTC 2011 - jengelh(a)medozas.de
+
+- Remove redundant tags/sections from specfile
+
+-------------------------------------------------------------------
+Mon Mar 14 13:02:38 UTC 2011 - mvyskocil(a)suse.cz
+
+- ignore openjdk for build of core ant
+
+-------------------------------------------------------------------
+Wed Mar 9 08:56:33 UTC 2011 - mvyskocil(a)suse.cz
+
+- Update to ant 1.8.2
+ * performance improvements in directory scanning
+ * XSLT task honors classpath again (bugrep 49271)
+ * distinction between core tasks and optional tasks is abolished
+ * new task augment allows to add attributes or nested elements to previously
+ defined references
+ * Lexically scoped local properties, i.e. properties that are only defined
+ inside a target, sequential block or similar environment. This is very
+ useful inside of <macrodef>s where a macro can now define a temporary
+ property that will disappear once the task has finished.
+ * <import> can now import from any file- or URL-providing resource - this
+ includes <javaresource>. This means <import> can read build file snippets
+ from JARs or fixed server URLs. There are several other improvements in the
+ area of import.
+ * Various improvements to the directory scanning code that help with symbolic
+ link cycles (as can be found on MacOS X Java installations for example) and
+ improve scanning performance. For big directory trees the improvement is
+ dramatic.
+ * The way developers can extend Ant's property expansion algorithm has been
+ rewritten (breaking the older API) to be easier to use and be more
+ powerful. The whole local properties mechanism is implemented using that
+ API and could be implemented in a separate library without changes in Ant's
+ core. Things like the yet-to-be-released props Antlib can now provide often
++++ 299 more lines (skipped)
++++ between /dev/null
++++ and /work/SRC/openSUSE:Factory/.ant.new/ant-junit.changes
--- /work/SRC/openSUSE:Factory/ant/ant.changes 2014-07-17 17:31:19.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.ant.new/ant.changes 2014-08-31 14:16:12.000000000 +0200
@@ -1,0 +2,7 @@
+Thu Aug 28 14:30:48 UTC 2014 - coolo(a)suse.com
+
+- to bootstrap 13.2 we need another split because bsf depends on things
+ that depend on junit and as antlr requires bsf, we need a 3rd step ->
+ split ant-junit to build in between ant and ant-antlr
+
+-------------------------------------------------------------------
New:
----
ant-junit.changes
ant-junit.spec
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ant-antlr.spec ++++++
--- /var/tmp/diff_new_pack.Z8mZBD/_old 2014-08-31 14:16:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Z8mZBD/_new 2014-08-31 14:16:15.000000000 +0200
@@ -19,7 +19,9 @@
##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####
-%global bootstrap 0
+%bcond_with bootstrap
+%bcond_with junit
+%bcond_without antlr
# disable javadoc build on arm platform - it delays a build a lot
# mvyskocil: ifarch does not work for noarch packages ...
@@ -49,7 +51,7 @@
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
-%if %bootstrap
+%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
@@ -62,15 +64,16 @@
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
-%if ! %bootstrap
+%if %{with junit} || %{with antlr}
BuildRequires: ant = %{version}
BuildRequires: junit
-BuildRequires: xalan-j2
+#!BuildIgnore: antlr
+%endif
+%if %{with antlr}
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
-#!BuildIgnore: antlr
%endif
-%if %bootstrap
+%if %{with bootstrap}
Requires: java-devel >= 1.5.0
Requires: javapackages-tools
Requires: jaxp_parser_impl
@@ -82,15 +85,26 @@
Provides: ant-nodeps = %{version}
Obsoletes: ant-trax < %{version}
Provides: ant-trax = %{version}
-%else
-# ant-antlr requires
+%endif
+%if %{with antlr}
Requires: antlr
%requires_eq ant
Provides: ant-antlr = %{version}-%{release}
%endif
+%if %{with junit}
+Requires: junit4
+%requires_eq ant
+%endif
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{with junit}
+%description
+Apache Ant is a Java-based build tool.
+
+This package contains optional JUnit tasks for Apache Ant.
+%else
+# FIXME: this should be different for antlr
%description
Apache Ant is a Java-based build tool. In theory, it is kind of like
Make, but without Make's wrinkles.
@@ -125,8 +139,9 @@
Ant has an <exec> task that allows different commands to be executed
based on the OS used.
+%endif
-%if %bootstrap
+%if %{with bootstrap}
%package -n ant-jmf
Summary: Optional jmf tasks for ant
License: Apache-2.0
@@ -166,7 +181,8 @@
Ant.
%endif #if bootstrap
-%if ! %bootstrap
+
+%if %{with antlr}
%package -n ant-apache-bsf
Summary: Optional apache bsf tasks for ant
@@ -299,6 +315,7 @@
License: Apache-2.0
Group: Development/Tools/Building
BuildRequires: regexp
+BuildRequires: xalan-j2
Requires: regexp
%requires_eq ant
@@ -344,18 +361,6 @@
This package contains optional jsch tasks for Apache Ant.
-%package -n ant-junit
-Summary: Optional junit tasks for ant
-License: Apache-2.0
-Group: Development/Tools/Building
-Requires: junit4
-%requires_eq ant
-
-%description -n ant-junit
-Apache Ant is a Java-based build tool.
-
-This package contains optional JUnit tasks for Apache Ant.
-
%package -n ant-testutil
Summary: Test utility classes for ant
License: Apache-2.0
@@ -395,7 +400,7 @@
find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
# When bootstrapping, we don't have junit
-%if %bootstrap
+%if %{with bootstrap}
%patch0 -p1
%if 0%{?suse_version} < 1200
%patch2 -p1
@@ -419,7 +424,11 @@
#rm src/tests/junit/org/example/junit/JUnit4Skippable.java
#install jars
-%if ! %bootstrap
+%if %{with junit}
+build-jar-repository -s -p lib/optional junit4
+%endif
+%if %{with antlr}
+# we need to build junit in antlr, but we remove it later
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
@@ -433,7 +442,7 @@
%build
export OPT_JAR_LIST=:
-%if ! %bootstrap
+%if %{with antlr} || %{with junit}
ant -Dbuild.sysclasspath=first jars test-jar
#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests.
@@ -444,8 +453,9 @@
ant javadocs
%endif
-%else
+%endif
+%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME=%{java_home}
export CLASSPATH=$JAVA_HOME/lib/tools.jar
@@ -461,6 +471,21 @@
install -d -m 755 %{buildroot}%{_javadir}/ant
install -d -m 755 %{buildroot}%{_mavenpomdir}
+%if ! %{with junit}
+rm build/lib/ant-junit*.jar
+%else
+# remove all others
+for i in build/lib/ant-*.jar ; do
+ case $i in
+ */ant-junit*)
+ ;;
+ *)
+ rm -v $i
+ ;;
+ esac
+done
+%endif
+
for jar in build/lib/*.jar
do
jarname=$(basename $jar .jar)
@@ -470,14 +495,14 @@
case $jarname in
#These go into %%{_javadir}, pom files have different names
ant | ant-bootstrap | ant-launcher)
-%if %bootstrap
+%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom"
%else
continue
%endif
;;
ant-jmf|ant-swing)
-%if %bootstrap
+%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}/ant; destname="ant/";
%else
continue
@@ -485,7 +510,7 @@
;;
#Bootstracp builds an incomplete ant-foo jars, don't ship them
*)
-%if %bootstrap
+%if %{with bootstrap}
continue
%else
#These go into %%{_javadir}/ant
@@ -508,7 +533,7 @@
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
done
-%if %bootstrap
+%if %{with bootstrap}
#ant-parent pom
install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
%add_maven_depmap JPP-ant-parent.pom
@@ -520,28 +545,39 @@
# XSLs
cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc
rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl
-%else
-cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %{buildroot}%{ant_home}/etc
+%endif
+%if %{with junit}
+cp -p src/etc/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}/etc
+%endif
+%if %{with antlr}
+cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}/etc
%endif
-%if %bootstrap
+%if %{with bootstrap}
# install everything else
mkdir -p %{buildroot}%{_bindir}
cp -p src/script/* %{buildroot}%{_bindir}/
mkdir -p %{buildroot}%{_datadir}/%{name}/bin/
ln -sf %{_bindir}/antRun %{buildroot}/%{_datadir}/%{name}/bin/antRun
%endif
-%if %bootstrap
+
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+
+%if %{with bootstrap}
# default ant.conf
mkdir -p %{buildroot}%{_sysconfdir}
cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf
# OPT_JAR_LIST fragments
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d
echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf
echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing
-%else
-mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+%endif
+
+%if %{with junit}
+echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit
+%endif
+
+%if %{with antlr}
echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr
echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf
echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver
@@ -556,10 +592,10 @@
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
-echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit
echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
-%if ! %bootstrap
+
+%if %{with antlr}
%if 0%{?build_javadoc}
mkdir -p %{buildroot}%{_javadocdir}/ant
@@ -573,7 +609,7 @@
(cd manual; ln -sf %{_javadocdir}/%{name} api)
%endif #javadoc
-%if %bootstrap
+%if %{with bootstrap}
find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
-a ! -name ant-update.xsl \
-a ! -name changelog.xsl \
@@ -585,7 +621,7 @@
| xargs -t rm
%endif
-%if %bootstrap
+%if %{with bootstrap}
%files
%defattr(0644,root,root,0755)
@@ -621,9 +657,9 @@
%config(noreplace) %{_mavendepmapfragdir}/*
%dir %{_mavenpomdir}
-%else
-# ant-antlr filelist
+%endif
+%if %{with antlr}
%files
%defattr(0644,root,root,0755)
%{_javadir}/ant/ant-antlr.jar
@@ -634,8 +670,21 @@
%dir %{_mavenpomdir}
%endif
+%if %{with junit}
+%files
+%defattr(0644,root,root,0755)
+%{_javadir}/ant/ant-junit*.jar
+%{ant_home}/lib/ant-junit*.jar
+%config(noreplace) %{_sysconfdir}/ant.d/junit
+%config(noreplace) %{_mavendepmapfragdir}/ant-junit
+%{ant_home}/etc/junit-frames.xsl
+%{ant_home}/etc/junit-noframes.xsl
+%{_mavenpomdir}/JPP.ant-ant-junit*.pom
+%dir %{_mavenpomdir}
+%endif
+
### Basic ant subpackages
-%if %bootstrap
+%if %{with bootstrap}
%files -n ant-jmf
%defattr(0644,root,root,0755)
@@ -658,7 +707,7 @@
%{_bindir}/*.py*
%endif #if bootstrap
-%if ! %bootstrap
+%if %{with antlr}
%files -n ant-apache-bsf
%defattr(0644,root,root,0755)
@@ -768,16 +817,6 @@
%{_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
-%config(noreplace) %{_sysconfdir}/ant.d/junit
-%{ant_home}/etc/junit-frames.xsl
-%{ant_home}/etc/junit-noframes.xsl
-%{_mavenpomdir}/JPP.ant-ant-junit*.pom
-%dir %{_mavenpomdir}
-
%files -n ant-testutil
%defattr(-,root,root,-)
%{_javadir}/ant/ant-testutil.jar
++++++ ant-junit.spec ++++++
++++ 840 lines (skipped)
++++++ ant.spec ++++++
--- /var/tmp/diff_new_pack.Z8mZBD/_old 2014-08-31 14:16:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Z8mZBD/_new 2014-08-31 14:16:15.000000000 +0200
@@ -18,7 +18,9 @@
#
-%global bootstrap 1
+%bcond_without bootstrap
+%bcond_with junit
+%bcond_with antlr
# disable javadoc build on arm platform - it delays a build a lot
# mvyskocil: ifarch does not work for noarch packages ...
@@ -48,7 +50,7 @@
Patch1: apache-ant-class-path-in-manifest.patch
#PATCH-FIX-SLE: fix building with old gcj by working around bugs
Patch2: apache-ant-old-gcj-build.patch
-%if %bootstrap
+%if %{with bootstrap}
BuildRequires: java-1_5_0-gcj-compat-devel
#!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel
#!BuildIgnore: java-1_7_0-openjdk java-1_7_0-openjdk-devel
@@ -61,15 +63,16 @@
#BuildRequires: xerces-j2-bootstrap
#!BuildIgnore: xerces-j2-bootstrap
BuildRequires: xml-commons-apis-bootstrap
-%if ! %bootstrap
+%if %{with junit} || %{with antlr}
BuildRequires: ant = %{version}
BuildRequires: junit
-BuildRequires: xalan-j2
+#!BuildIgnore: antlr
+%endif
+%if %{with antlr}
BuildRequires: xerces-j2
BuildRequires: xml-commons-apis
-#!BuildIgnore: antlr
%endif
-%if %bootstrap
+%if %{with bootstrap}
Requires: java-devel >= 1.5.0
Requires: javapackages-tools
Requires: jaxp_parser_impl
@@ -81,15 +84,26 @@
Provides: ant-nodeps = %{version}
Obsoletes: ant-trax < %{version}
Provides: ant-trax = %{version}
-%else
-# ant-antlr requires
+%endif
+%if %{with antlr}
Requires: antlr
%requires_eq ant
Provides: ant-antlr = %{version}-%{release}
%endif
+%if %{with junit}
+Requires: junit4
+%requires_eq ant
+%endif
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if %{with junit}
+%description
+Apache Ant is a Java-based build tool.
+
+This package contains optional JUnit tasks for Apache Ant.
+%else
+# FIXME: this should be different for antlr
%description
Apache Ant is a Java-based build tool. In theory, it is kind of like
Make, but without Make's wrinkles.
@@ -124,8 +138,9 @@
Ant has an <exec> task that allows different commands to be executed
based on the OS used.
+%endif
-%if %bootstrap
+%if %{with bootstrap}
%package -n ant-jmf
Summary: Optional jmf tasks for ant
License: Apache-2.0
@@ -165,7 +180,8 @@
Ant.
%endif #if bootstrap
-%if ! %bootstrap
+
+%if %{with antlr}
%package -n ant-apache-bsf
Summary: Optional apache bsf tasks for ant
@@ -298,6 +314,7 @@
License: Apache-2.0
Group: Development/Tools/Building
BuildRequires: regexp
+BuildRequires: xalan-j2
Requires: regexp
%requires_eq ant
@@ -343,18 +360,6 @@
This package contains optional jsch tasks for Apache Ant.
-%package -n ant-junit
-Summary: Optional junit tasks for ant
-License: Apache-2.0
-Group: Development/Tools/Building
-Requires: junit4
-%requires_eq ant
-
-%description -n ant-junit
-Apache Ant is a Java-based build tool.
-
-This package contains optional JUnit tasks for Apache Ant.
-
%package -n ant-testutil
Summary: Test utility classes for ant
License: Apache-2.0
@@ -394,7 +399,7 @@
find -name build.xml -o -name pom.xml | xargs sed -i -e s/-SNAPSHOT//
# When bootstrapping, we don't have junit
-%if %bootstrap
+%if %{with bootstrap}
%patch0 -p1
%if 0%{?suse_version} < 1200
%patch2 -p1
@@ -418,7 +423,11 @@
#rm src/tests/junit/org/example/junit/JUnit4Skippable.java
#install jars
-%if ! %bootstrap
+%if %{with junit}
+build-jar-repository -s -p lib/optional junit4
+%endif
+%if %{with antlr}
+# we need to build junit in antlr, but we remove it later
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
@@ -432,7 +441,7 @@
%build
export OPT_JAR_LIST=:
-%if ! %bootstrap
+%if %{with antlr} || %{with junit}
ant -Dbuild.sysclasspath=first jars test-jar
#remove empty jai and netrexx jars. Due to missing dependencies they contain only manifests.
@@ -443,8 +452,9 @@
ant javadocs
%endif
-%else
+%endif
+%if %{with bootstrap}
export GC_MAXIMUM_HEAP_SIZE="134217728" #128M
export JAVA_HOME=%{java_home}
export CLASSPATH=$JAVA_HOME/lib/tools.jar
@@ -460,6 +470,21 @@
install -d -m 755 %{buildroot}%{_javadir}/ant
install -d -m 755 %{buildroot}%{_mavenpomdir}
+%if ! %{with junit}
+rm build/lib/ant-junit*.jar
+%else
+# remove all others
+for i in build/lib/ant-*.jar ; do
+ case $i in
+ */ant-junit*)
+ ;;
+ *)
+ rm -v $i
+ ;;
+ esac
+done
+%endif
+
for jar in build/lib/*.jar
do
jarname=$(basename $jar .jar)
@@ -469,14 +494,14 @@
case $jarname in
#These go into %%{_javadir}, pom files have different names
ant | ant-bootstrap | ant-launcher)
-%if %bootstrap
+%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}; destname="";pomname="JPP-$jarname.pom"
%else
continue
%endif
;;
ant-jmf|ant-swing)
-%if %bootstrap
+%if %{with bootstrap}
destdir=%{buildroot}%{_javadir}/ant; destname="ant/";
%else
continue
@@ -484,7 +509,7 @@
;;
#Bootstracp builds an incomplete ant-foo jars, don't ship them
*)
-%if %bootstrap
+%if %{with bootstrap}
continue
%else
#These go into %%{_javadir}/ant
@@ -507,7 +532,7 @@
%add_maven_depmap ${pomname} ${destname}${jarname}.jar
done
-%if %bootstrap
+%if %{with bootstrap}
#ant-parent pom
install -m 644 src/etc/poms/pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ant-parent.pom
%add_maven_depmap JPP-ant-parent.pom
@@ -519,28 +544,39 @@
# XSLs
cp -p src/etc/*.xsl %{buildroot}%{ant_home}/etc
rm -f %{buildroot}%{ant_home}/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl
-%else
-cp -p src/etc/{maudit-frames,jdepend,jdepend-frames,junit-frames,junit-noframes}.xsl %{buildroot}%{ant_home}/etc
+%endif
+%if %{with junit}
+cp -p src/etc/{junit-noframes,junit-frames}.xsl %{buildroot}%{ant_home}/etc
+%endif
+%if %{with antlr}
+cp -p src/etc/{maudit-frames,jdepend,jdepend-frames}.xsl %{buildroot}%{ant_home}/etc
%endif
-%if %bootstrap
+%if %{with bootstrap}
# install everything else
mkdir -p %{buildroot}%{_bindir}
cp -p src/script/* %{buildroot}%{_bindir}/
mkdir -p %{buildroot}%{_datadir}/%{name}/bin/
ln -sf %{_bindir}/antRun %{buildroot}/%{_datadir}/%{name}/bin/antRun
%endif
-%if %bootstrap
+
+mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+
+%if %{with bootstrap}
# default ant.conf
mkdir -p %{buildroot}%{_sysconfdir}
cp -p %{SOURCE1} %{buildroot}%{_sysconfdir}/ant.conf
# OPT_JAR_LIST fragments
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}.d
echo "ant/ant-jmf" > %{buildroot}%{_sysconfdir}/%{name}.d/jmf
echo "ant/ant-swing" > %{buildroot}%{_sysconfdir}/%{name}.d/swing
-%else
-mkdir -p %{buildroot}%{_sysconfdir}/ant.d
+%endif
+
+%if %{with junit}
+echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit
+%endif
+
+%if %{with antlr}
echo "antlr ant/ant-antlr" > %{buildroot}%{_sysconfdir}/ant.d/antlr
echo "bsf ant/ant-apache-bsf" > %{buildroot}%{_sysconfdir}/ant.d/apache-bsf
echo "xml-commons-resolver ant/ant-apache-resolver" > %{buildroot}%{_sysconfdir}/ant.d/apache-resolver
@@ -555,10 +591,10 @@
echo "javamail jaf ant/ant-javamail" > %{buildroot}%{_sysconfdir}/ant.d/javamail
echo "jdepend ant/ant-jdepend" > %{buildroot}%{_sysconfdir}/ant.d/jdepend
echo "jsch ant/ant-jsch" > %{buildroot}%{_sysconfdir}/ant.d/jsch
-echo "junit ant/ant-junit" > %{buildroot}%{_sysconfdir}/ant.d/junit
echo "testutil ant/ant-testutil" > %{buildroot}%{_sysconfdir}/ant.d/testutil
%endif
-%if ! %bootstrap
+
+%if %{with antlr}
%if 0%{?build_javadoc}
mkdir -p %{buildroot}%{_javadocdir}/ant
@@ -572,7 +608,7 @@
(cd manual; ln -sf %{_javadocdir}/%{name} api)
%endif #javadoc
-%if %bootstrap
+%if %{with bootstrap}
find %{buildroot}%{_datadir}/ant/etc -type f -name "*.xsl" \
-a ! -name ant-update.xsl \
-a ! -name changelog.xsl \
@@ -584,7 +620,7 @@
| xargs -t rm
%endif
-%if %bootstrap
+%if %{with bootstrap}
%files
%defattr(0644,root,root,0755)
@@ -620,9 +656,9 @@
%config(noreplace) %{_mavendepmapfragdir}/*
%dir %{_mavenpomdir}
-%else
-# ant-antlr filelist
+%endif
+%if %{with antlr}
%files
%defattr(0644,root,root,0755)
%{_javadir}/ant/ant-antlr.jar
@@ -633,8 +669,21 @@
%dir %{_mavenpomdir}
%endif
+%if %{with junit}
+%files
+%defattr(0644,root,root,0755)
+%{_javadir}/ant/ant-junit*.jar
+%{ant_home}/lib/ant-junit*.jar
+%config(noreplace) %{_sysconfdir}/ant.d/junit
+%config(noreplace) %{_mavendepmapfragdir}/ant-junit
+%{ant_home}/etc/junit-frames.xsl
+%{ant_home}/etc/junit-noframes.xsl
+%{_mavenpomdir}/JPP.ant-ant-junit*.pom
+%dir %{_mavenpomdir}
+%endif
+
### Basic ant subpackages
-%if %bootstrap
+%if %{with bootstrap}
%files -n ant-jmf
%defattr(0644,root,root,0755)
@@ -657,7 +706,7 @@
%{_bindir}/*.py*
%endif #if bootstrap
-%if ! %bootstrap
+%if %{with antlr}
%files -n ant-apache-bsf
%defattr(0644,root,root,0755)
@@ -767,16 +816,6 @@
%{_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
-%config(noreplace) %{_sysconfdir}/ant.d/junit
-%{ant_home}/etc/junit-frames.xsl
-%{ant_home}/etc/junit-noframes.xsl
-%{_mavenpomdir}/JPP.ant-ant-junit*.pom
-%dir %{_mavenpomdir}
-
%files -n ant-testutil
%defattr(-,root,root,-)
%{_javadir}/ant/ant-testutil.jar
++++++ pre_checkin.sh ++++++
--- /var/tmp/diff_new_pack.Z8mZBD/_old 2014-08-31 14:16:15.000000000 +0200
+++ /var/tmp/diff_new_pack.Z8mZBD/_new 2014-08-31 14:16:15.000000000 +0200
@@ -1,6 +1,15 @@
#!/bin/sh
EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ant.spec! #####\n"
-sed "s/^%global bootstrap.*$/${EDIT_WARNING}%global bootstrap 0/;
+sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/;
+ s/^%bcond_with antlr/%bcond_without antlr/;
s/^\(Name:.*\)$/\1-antlr/;
0,/^Summary:.*/{s/^Summary:.*/Summary: Antlr Task for ant/};
" < ant.spec > ant-antlr.spec
+sed "s/^%bcond_without bootstrap$/${EDIT_WARNING}%bcond_with bootstrap/;
+ s/^%bcond_with junit/%bcond_without junit/;
+ s/^\(Name:.*\)$/\1-junit/;
+ 0,/^Summary:.*/{s/^Summary:.*/Summary: Optional junit tasks for ant/};
+ " < ant.spec > ant-junit.spec
+cp ant.changes ant-junit.changes
+
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org
For additional commands, e-mail: opensuse-commit+help(a)opensuse.org
