Hello community, here is the log from the commit of package ant for openSUSE:Factory checked in at 2014-07-17 17:31:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-05-02 13:53:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new/ant-antlr.changes 2014-07-17 17:31:19.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jul 4 12:56:17 UTC 2014 - [email protected] + +- Fix borked summaries for subpackages. + +------------------------------------------------------------------- +Fri Jul 4 11:54:48 UTC 2014 - [email protected] + +- 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. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/ant/ant.changes 2014-05-02 13:53:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ant.new/ant.changes 2014-07-17 17:31:19.000000000 +0200 @@ -1,0 +2,31 @@ +Fri Jul 4 12:47:07 UTC 2014 - [email protected] + +- Fix building on SLE. +- Added patch: + * apache-ant-old-gcj-build.patch + +------------------------------------------------------------------- +Fri Jul 4 11:54:48 UTC 2014 - [email protected] + +- 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 - [email protected] + +- fix summary (was antlr summary) + +------------------------------------------------------------------- +Mon May 12 14:00:55 UTC 2014 - [email protected] + +- 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 + +------------------------------------------------------------------- Old: ---- apache-ant-1.9.3-src.tar.bz2 apache-ant-1.9.3-src.tar.bz2.asc New: ---- apache-ant-1.9.4-src.tar.bz2 apache-ant-1.9.4-src.tar.bz2.asc apache-ant-old-gcj-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ant-antlr.spec ++++++ --- /var/tmp/diff_new_pack.BMkRGB/_old 2014-07-17 17:31:20.000000000 +0200 +++ /var/tmp/diff_new_pack.BMkRGB/_new 2014-07-17 17:31:20.000000000 +0200 @@ -34,7 +34,7 @@ %global major_version 1.9 Name: ant-antlr -Version: 1.9.3 +Version: 1.9.4 Release: 0 Summary: Antlr Task for ant License: Apache-2.0 @@ -45,10 +45,10 @@ Source1000: pre_checkin.sh Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc Source1002: ant.keyring - Patch0: apache-ant-no-test-jar.patch 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 BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel @@ -64,7 +64,7 @@ BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap BuildRequires: ant = %{version} -BuildRequires: junit4 +BuildRequires: junit BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -74,7 +74,6 @@ Requires: java-devel >= 1.5.0 Requires: javapackages-tools Requires: jaxp_parser_impl -#Requires: xerces-j2 >= 2.7.1-2 Requires: xml-commons-apis Requires: xml-commons-resolver Obsoletes: apache-ant < %{version} @@ -128,7 +127,6 @@ %if %bootstrap - %package -n ant-jmf Summary: Optional jmf tasks for ant License: Apache-2.0 @@ -141,11 +139,6 @@ This package contains optional jmf tasks for Apache Ant. - - - - - %package -n ant-swing Summary: Optional swing tasks for ant License: Apache-2.0 @@ -158,10 +151,6 @@ This package contains optional swing tasks for Apache Ant. - - - - %package -n ant-scripts Summary: Additional scripts for ant License: Apache-2.0 @@ -176,8 +165,6 @@ This package contains additional perl and python scripts for Apache Ant. - - %endif #if bootstrap %if ! %bootstrap @@ -188,15 +175,12 @@ Requires: bsf %requires_eq ant BuildRequires: bsf -Provides: ant-apache-bsf = %{version}-%{release} %description -n ant-apache-bsf Apache Ant is a Java-based build tool. This package contains optional apache bsf tasks for Apache Ant. - - %package -n ant-apache-resolver Summary: Optional apache resolver tasks for ant License: Apache-2.0 @@ -204,15 +188,12 @@ Requires: xml-commons-resolver %requires_eq ant BuildRequires: xml-commons-resolver -Provides: ant-apache-resolver = %{version}-%{release} %description -n ant-apache-resolver Apache Ant is a Java-based build tool. This package contains optional apache resolver tasks for Apache Ant. - - %package -n ant-commons-logging Summary: Optional commons logging tasks for ant License: Apache-2.0 @@ -220,15 +201,12 @@ Requires: jakarta-commons-logging %requires_eq ant BuildRequires: jakarta-commons-logging -Provides: ant-commons-logging = %{version}-%{release} %description -n ant-commons-logging Apache Ant is a Java-based build tool. This package contains optional commons logging tasks for Apache Ant. - - %package -n ant-commons-net Summary: Optional commons net tasks for ant License: Apache-2.0 @@ -236,27 +214,21 @@ Requires: jakarta-commons-net %requires_eq ant BuildRequires: jakarta-commons-net -Provides: ant-commons-net = %{version}-%{release} %description -n ant-commons-net Apache Ant is a Java-based build tool. This package contains optional commons net tasks for Apache Ant. - - # Disable because we don't ship the dependencies %if 0 - %package -n ant-jai - Summary: Optional jai tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jai %requires_eq ant BuildRequires: jai -Provides: ant-jai = %{version}-%{release} %description -n ant-jai Optional jai tasks for ant. @@ -269,7 +241,6 @@ Requires: bcel %requires_eq ant BuildRequires: bcel -Provides: ant-apache-bcel = %{version} Provides: ant-jakarta-bcel = %{version} Obsoletes: ant-jakarta-bcel < %{version} @@ -278,8 +249,6 @@ This package contains optional apache bcel tasks for Apache Ant. - - %package -n ant-apache-log4j Summary: Optional apache log4j tasks for ant License: Apache-2.0 @@ -287,7 +256,6 @@ Requires: log4j %requires_eq ant BuildRequires: log4j-mini -Provides: ant-apache-log4j = %{version} Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -296,8 +264,6 @@ This package contains optional apache log4j tasks for Apache Ant. - - %package -n ant-apache-oro Summary: Optional apache oro tasks for ant License: Apache-2.0 @@ -305,7 +271,6 @@ Requires: oro %requires_eq ant BuildRequires: oro -Provides: ant-apache-oro = %{version} Provides: ant-jakarta-oro = %{version} Obsoletes: ant-jakarta-oro < %{version} @@ -314,8 +279,6 @@ This package contains optional apache oro tasks for Apache Ant. - - %package -n ant-apache-regexp Summary: Optional apache regexp tasks for ant License: Apache-2.0 @@ -323,7 +286,6 @@ Requires: regexp %requires_eq ant BuildRequires: regexp -Provides: ant-apache-regexp = %{version} Provides: ant-jakarta-regexp = %{version} Obsoletes: ant-jakarta-regexp < %{version} @@ -339,12 +301,10 @@ BuildRequires: regexp Requires: regexp %requires_eq ant -Provides: ant-apache-xalan2 = %{version} %description -n ant-apache-xalan2 Optional apache xalan2 tasks for %{name}. - %package -n ant-javamail Summary: Optional javamail tasks for ant License: CDDL-1.0 @@ -352,15 +312,12 @@ BuildRequires: javamail >= 1.2-5jpp Requires: javamail >= 1.2-5jpp %requires_eq ant -Provides: ant-javamail = %{version} %description -n ant-javamail Apache Ant is a Java-based build tool. This package contains optional javamail tasks for Apache Ant. - - %package -n ant-jdepend Summary: Optional jdepend tasks for ant License: Apache-2.0 @@ -368,15 +325,12 @@ Requires: jdepend %requires_eq ant BuildRequires: jdepend -Provides: ant-jdepend = %{version} %description -n ant-jdepend Apache Ant is a Java-based build tool. This package contains optional jdepend tasks for Apache Ant. - - %package -n ant-jsch Summary: Optional jsch tasks for ant License: Apache-2.0 @@ -384,22 +338,18 @@ Requires: jsch %requires_eq ant BuildRequires: jsch -Provides: ant-jsch = %{version} %description -n ant-jsch Apache Ant is a Java-based build tool. 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 -Provides: ant-junit = %{version} %description -n ant-junit Apache Ant is a Java-based build tool. @@ -412,13 +362,10 @@ Group: Development/Tools/Building Requires: junit4 %requires_eq ant -Provides: ant-testutil = %{version} %description -n ant-testutil Test utility tasks for %{name}. - - %package -n ant-manual Summary: Manual for ant License: Apache-2.0 @@ -429,9 +376,7 @@ This package contains the manual for Apache Ant. - %if 0%{?build_javadoc} - %package -n ant-javadoc Summary: Javadoc for ant License: Apache-2.0 @@ -442,7 +387,6 @@ This package contains the javadoc documentation for Apache Ant. %endif #javadoc - %endif %prep @@ -453,6 +397,9 @@ # When bootstrapping, we don't have junit %if %bootstrap %patch0 -p1 +%if 0%{?suse_version} < 1200 +%patch2 -p1 +%endif %endif # Fix class-path-in-manifest rpmlint warning @@ -487,14 +434,14 @@ export OPT_JAR_LIST=: %if ! %bootstrap -%{ant} -Dbuild.sysclasspath=first jars test-jar +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} 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 +ant javadocs %endif %else @@ -564,7 +511,6 @@ %if %bootstrap #ant-parent pom 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 ++++++ ant.spec ++++++ --- /var/tmp/diff_new_pack.BMkRGB/_old 2014-07-17 17:31:20.000000000 +0200 +++ /var/tmp/diff_new_pack.BMkRGB/_new 2014-07-17 17:31:20.000000000 +0200 @@ -33,9 +33,9 @@ %global major_version 1.9 Name: ant -Version: 1.9.3 +Version: 1.9.4 Release: 0 -Summary: Antlr Task for ant +Summary: Java-based build tool License: Apache-2.0 Group: Development/Tools/Building Url: http://ant.apache.org/ @@ -44,10 +44,10 @@ Source1000: pre_checkin.sh Source1001: http://www.apache.org/dist/ant/source/apache-ant-%{version}-src.tar.bz2.asc Source1002: ant.keyring - Patch0: apache-ant-no-test-jar.patch 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 BuildRequires: java-1_5_0-gcj-compat-devel #!BuildIgnore: java-1_6_0-openjdk java-1_6_0-openjdk-devel @@ -63,7 +63,7 @@ BuildRequires: xml-commons-apis-bootstrap %if ! %bootstrap BuildRequires: ant = %{version} -BuildRequires: junit4 +BuildRequires: junit BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis @@ -73,7 +73,6 @@ Requires: java-devel >= 1.5.0 Requires: javapackages-tools Requires: jaxp_parser_impl -#Requires: xerces-j2 >= 2.7.1-2 Requires: xml-commons-apis Requires: xml-commons-resolver Obsoletes: apache-ant < %{version} @@ -127,7 +126,6 @@ %if %bootstrap - %package -n ant-jmf Summary: Optional jmf tasks for ant License: Apache-2.0 @@ -140,11 +138,6 @@ This package contains optional jmf tasks for Apache Ant. - - - - - %package -n ant-swing Summary: Optional swing tasks for ant License: Apache-2.0 @@ -157,10 +150,6 @@ This package contains optional swing tasks for Apache Ant. - - - - %package -n ant-scripts Summary: Additional scripts for ant License: Apache-2.0 @@ -175,8 +164,6 @@ This package contains additional perl and python scripts for Apache Ant. - - %endif #if bootstrap %if ! %bootstrap @@ -187,15 +174,12 @@ Requires: bsf %requires_eq ant BuildRequires: bsf -Provides: ant-apache-bsf = %{version}-%{release} %description -n ant-apache-bsf Apache Ant is a Java-based build tool. This package contains optional apache bsf tasks for Apache Ant. - - %package -n ant-apache-resolver Summary: Optional apache resolver tasks for ant License: Apache-2.0 @@ -203,15 +187,12 @@ Requires: xml-commons-resolver %requires_eq ant BuildRequires: xml-commons-resolver -Provides: ant-apache-resolver = %{version}-%{release} %description -n ant-apache-resolver Apache Ant is a Java-based build tool. This package contains optional apache resolver tasks for Apache Ant. - - %package -n ant-commons-logging Summary: Optional commons logging tasks for ant License: Apache-2.0 @@ -219,15 +200,12 @@ Requires: jakarta-commons-logging %requires_eq ant BuildRequires: jakarta-commons-logging -Provides: ant-commons-logging = %{version}-%{release} %description -n ant-commons-logging Apache Ant is a Java-based build tool. This package contains optional commons logging tasks for Apache Ant. - - %package -n ant-commons-net Summary: Optional commons net tasks for ant License: Apache-2.0 @@ -235,27 +213,21 @@ Requires: jakarta-commons-net %requires_eq ant BuildRequires: jakarta-commons-net -Provides: ant-commons-net = %{version}-%{release} %description -n ant-commons-net Apache Ant is a Java-based build tool. This package contains optional commons net tasks for Apache Ant. - - # Disable because we don't ship the dependencies %if 0 - %package -n ant-jai - Summary: Optional jai tasks for ant License: Apache-2.0 Group: Development/Tools/Building Requires: jai %requires_eq ant BuildRequires: jai -Provides: ant-jai = %{version}-%{release} %description -n ant-jai Optional jai tasks for ant. @@ -268,7 +240,6 @@ Requires: bcel %requires_eq ant BuildRequires: bcel -Provides: ant-apache-bcel = %{version} Provides: ant-jakarta-bcel = %{version} Obsoletes: ant-jakarta-bcel < %{version} @@ -277,8 +248,6 @@ This package contains optional apache bcel tasks for Apache Ant. - - %package -n ant-apache-log4j Summary: Optional apache log4j tasks for ant License: Apache-2.0 @@ -286,7 +255,6 @@ Requires: log4j %requires_eq ant BuildRequires: log4j-mini -Provides: ant-apache-log4j = %{version} Provides: ant-jakarta-log4j = %{version} Obsoletes: ant-jakarta-log4j < %{version} @@ -295,8 +263,6 @@ This package contains optional apache log4j tasks for Apache Ant. - - %package -n ant-apache-oro Summary: Optional apache oro tasks for ant License: Apache-2.0 @@ -304,7 +270,6 @@ Requires: oro %requires_eq ant BuildRequires: oro -Provides: ant-apache-oro = %{version} Provides: ant-jakarta-oro = %{version} Obsoletes: ant-jakarta-oro < %{version} @@ -313,8 +278,6 @@ This package contains optional apache oro tasks for Apache Ant. - - %package -n ant-apache-regexp Summary: Optional apache regexp tasks for ant License: Apache-2.0 @@ -322,7 +285,6 @@ Requires: regexp %requires_eq ant BuildRequires: regexp -Provides: ant-apache-regexp = %{version} Provides: ant-jakarta-regexp = %{version} Obsoletes: ant-jakarta-regexp < %{version} @@ -338,12 +300,10 @@ BuildRequires: regexp Requires: regexp %requires_eq ant -Provides: ant-apache-xalan2 = %{version} %description -n ant-apache-xalan2 Optional apache xalan2 tasks for %{name}. - %package -n ant-javamail Summary: Optional javamail tasks for ant License: CDDL-1.0 @@ -351,15 +311,12 @@ BuildRequires: javamail >= 1.2-5jpp Requires: javamail >= 1.2-5jpp %requires_eq ant -Provides: ant-javamail = %{version} %description -n ant-javamail Apache Ant is a Java-based build tool. This package contains optional javamail tasks for Apache Ant. - - %package -n ant-jdepend Summary: Optional jdepend tasks for ant License: Apache-2.0 @@ -367,15 +324,12 @@ Requires: jdepend %requires_eq ant BuildRequires: jdepend -Provides: ant-jdepend = %{version} %description -n ant-jdepend Apache Ant is a Java-based build tool. This package contains optional jdepend tasks for Apache Ant. - - %package -n ant-jsch Summary: Optional jsch tasks for ant License: Apache-2.0 @@ -383,22 +337,18 @@ Requires: jsch %requires_eq ant BuildRequires: jsch -Provides: ant-jsch = %{version} %description -n ant-jsch Apache Ant is a Java-based build tool. 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 -Provides: ant-junit = %{version} %description -n ant-junit Apache Ant is a Java-based build tool. @@ -411,13 +361,10 @@ Group: Development/Tools/Building Requires: junit4 %requires_eq ant -Provides: ant-testutil = %{version} %description -n ant-testutil Test utility tasks for %{name}. - - %package -n ant-manual Summary: Manual for ant License: Apache-2.0 @@ -428,9 +375,7 @@ This package contains the manual for Apache Ant. - %if 0%{?build_javadoc} - %package -n ant-javadoc Summary: Javadoc for ant License: Apache-2.0 @@ -441,7 +386,6 @@ This package contains the javadoc documentation for Apache Ant. %endif #javadoc - %endif %prep @@ -452,6 +396,9 @@ # When bootstrapping, we don't have junit %if %bootstrap %patch0 -p1 +%if 0%{?suse_version} < 1200 +%patch2 -p1 +%endif %endif # Fix class-path-in-manifest rpmlint warning @@ -486,14 +433,14 @@ export OPT_JAR_LIST=: %if ! %bootstrap -%{ant} -Dbuild.sysclasspath=first jars test-jar +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} 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 +ant javadocs %endif %else @@ -563,7 +510,6 @@ %if %bootstrap #ant-parent pom 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 ++++++ apache-ant-1.9.3-src.tar.bz2 -> apache-ant-1.9.4-src.tar.bz2 ++++++ ++++ 50017 lines of diff (skipped) ++++++ apache-ant-old-gcj-build.patch ++++++ diff -urN apache-ant-1.9.4.old/src/main/org/apache/tools/ant/util/VectorSet.java apache-ant-1.9.4/src/main/org/apache/tools/ant/util/VectorSet.java --- apache-ant-1.9.4.old/src/main/org/apache/tools/ant/util/VectorSet.java 2014-07-04 14:36:26.370041107 +0200 +++ apache-ant-1.9.4/src/main/org/apache/tools/ant/util/VectorSet.java 2014-07-04 14:44:12.888084246 +0200 @@ -122,7 +122,7 @@ count - index); } for (Object o : toAdd) { - elementData[index++] = o; + elementData[index++] = (E) o; } elementCount += toAdd.size(); return true; diff -urN apache-ant-1.9.4.old/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java apache-ant-1.9.4/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java --- apache-ant-1.9.4.old/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java 2014-07-04 14:36:26.372041107 +0200 +++ apache-ant-1.9.4/src/main/org/apache/tools/zip/Simple8BitZipEncoding.java 2014-07-04 14:42:23.841074163 +0200 @@ -101,7 +101,7 @@ * stored as an array of 128 chars. */ public Simple8BitZipEncoding(char[] highChars) { - this.highChars = highChars.clone(); + this.highChars = (char[]) highChars.clone(); List<Simple8BitChar> temp = new ArrayList<Simple8BitChar>(this.highChars.length); ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.BMkRGB/_old 2014-07-17 17:31:23.000000000 +0200 +++ /var/tmp/diff_new_pack.BMkRGB/_new 2014-07-17 17:31:23.000000000 +0200 @@ -2,4 +2,5 @@ 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/; s/^\(Name:.*\)$/\1-antlr/; + 0,/^Summary:.*/{s/^Summary:.*/Summary: Antlr Task for ant/}; " < ant.spec > ant-antlr.spec -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
