Hello community, here is the log from the commit of package objectweb-anttask for openSUSE:Factory checked in at 2017-10-06 10:55:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/objectweb-anttask (Old) and /work/SRC/openSUSE:Factory/.objectweb-anttask.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "objectweb-anttask" Fri Oct 6 10:55:34 2017 rev:18 rq:531103 version:1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/objectweb-anttask/objectweb-anttask.changes 2013-09-26 19:38:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.objectweb-anttask.new/objectweb-anttask.changes 2017-10-06 10:55:35.788590515 +0200 @@ -1,0 +2,15 @@ +Wed Oct 4 08:47:31 UTC 2017 - fst...@suse.com + +- Specify java source and target level 1.6 in order to allow + building with jdk9 +- Removed patch: + * objectweb-anttask-java14compat.patch + + Do not hardcode java source and target levels; we specify + them on command-line + * objectweb-anttask-java5.patch + + Rename enum -> emun, since "enum" is a keyword in java5+ + + Fix "no suitable method found for put(String,String) ... + argument mismatch; String cannot be converted to String[]" + with java5+ + +------------------------------------------------------------------- Old: ---- objectweb-anttask-java14compat.patch New: ---- objectweb-anttask-java5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ objectweb-anttask.spec ++++++ --- /var/tmp/diff_new_pack.3eSj6e/_old 2017-10-06 10:55:36.744446036 +0200 +++ /var/tmp/diff_new_pack.3eSj6e/_new 2017-10-06 10:55:36.744446036 +0200 @@ -1,7 +1,7 @@ # # spec file for package objectweb-anttask # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,54 +14,52 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# icecream 0 Name: objectweb-anttask +Version: 1.2 +Release: 0 Summary: ObjectWeb Ant task License: LGPL-2.1+ Group: Development/Languages/Java -Version: 1.2 -Release: 0 Url: http://forge.objectweb.org/projects/monolog/ -BuildArch: noarch Source0: ow_util_ant_tasks_1.2.zip -Patch: %{name}-java14compat.patch Patch1: objectweb-anttask-ant17.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Provides: owanttask +Patch2: objectweb-anttask-java5.patch BuildRequires: ant -BuildRequires: java-1_5_0-gcj-compat-devel +BuildRequires: java-devel BuildRequires: unzip BuildRequires: xalan-j2 BuildRequires: xml-commons-apis +Provides: owanttask +BuildArch: noarch %description ObjectWeb Ant task - - %prep -%setup -c -q -n %{name} -%patch +%setup -q -c -n %{name} %patch1 +%patch2 -p1 find . -name "*.class" -exec rm {} \; find . -name "*.jar" -exec rm {} \; %build export CLASSPATH=$(build-classpath xalan-j2) -ant -Dbuild.compiler=modern jar +ant \ + -Dbuild.compiler=modern \ + -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \ + jar %install # jars -install -d -m 0755 $RPM_BUILD_ROOT%{_javadir} -install -m 644 output/lib/ow_util_ant_tasks.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -pushd $RPM_BUILD_ROOT%{_javadir} +install -d -m 0755 %{buildroot}%{_javadir} +install -m 644 output/lib/ow_util_ant_tasks.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +pushd %{buildroot}%{_javadir} ln -sf %{name}-%{version}.jar %{name}.jar popd %files -%defattr(0644,root,root,0755) %{_javadir}/* %changelog ++++++ objectweb-anttask-java14compat.patch -> objectweb-anttask-java5.patch ++++++ --- /work/SRC/openSUSE:Factory/objectweb-anttask/objectweb-anttask-java14compat.patch 2011-09-23 02:14:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.objectweb-anttask.new/objectweb-anttask-java5.patch 2017-10-06 10:55:35.304663662 +0200 @@ -1,13 +1,74 @@ -diff -Naur ../objectweb-anttask.orig/build.xml ./build.xml ---- ../objectweb-anttask.orig/build.xml 2004-08-26 18:21:06.000000000 +0200 -+++ ./build.xml 2006-09-21 13:17:52.000000000 +0200 -@@ -8,7 +8,8 @@ - - <target name="compile"> - <mkdir dir="${out.build}"/> -- <javac srcdir="${prj.src}" destdir="${out.build}" debug="on"> -+ <javac srcdir="${prj.src}" destdir="${out.build}" debug="on" -+ source="1.4" target="1.4"> - <include name="**/*.java"/> - </javac> - </target> +--- objectweb-anttask/src/org/objectweb/util/ant/JavadocMultipleLink.java 2004-01-26 09:55:26.000000000 +0100 ++++ objectweb-anttask/src/org/objectweb/util/ant/JavadocMultipleLink.java 2017-10-04 10:45:59.549577218 +0200 +@@ -85,8 +85,8 @@ + + // Add files + try { +- for(Enumeration enum = v.elements(); enum.hasMoreElements();) { +- File current = new File((File) enum.nextElement(), ++ for(Enumeration emun = v.elements(); emun.hasMoreElements();) { ++ File current = new File((File) emun.nextElement(), + TEMP_CLASS_NAME + ".java"); + if (!current.createNewFile()) + continue; +@@ -103,8 +103,8 @@ + super.execute(); + + // Remove files +- for(Enumeration enum = v.elements(); enum.hasMoreElements();) { +- new File((File) enum.nextElement(), ++ for(Enumeration emun = v.elements(); emun.hasMoreElements();) { ++ new File((File) emun.nextElement(), + TEMP_CLASS_NAME + ".java").delete(); + } + } +--- objectweb-anttask/src/org/objectweb/util/ant/MultipleCopy.java 2017-10-04 10:45:40.517577146 +0200 ++++ objectweb-anttask/src/org/objectweb/util/ant/MultipleCopy.java 2017-10-04 10:46:51.881577416 +0200 +@@ -14,7 +14,6 @@ + import org.apache.tools.ant.types.ResourceCollection; + + import java.io.File; +-import java.util.StringTokenizer; + + /** + * @author <A HREF="mailto:sebastien.chassa...@inrialpes.fr><b> +@@ -51,20 +50,6 @@ + * Performs the copy operation. + */ + public void copy() throws BuildException { +- boolean ant16 = false; +- String version = getProject().getProperty("ant.version"); +- StringTokenizer st = new StringTokenizer(version, " "); +- while (st.hasMoreTokens()) { +- String s = st.nextToken(); +- if (s.length() > 2 && Character.isDigit(s.charAt(0)) && s.charAt(1) == '.') { +- if ((int)(s.charAt(0) - '0') > 1) { +- ant16 = true; +- } else if ((int)(s.charAt(2) - '0') > 5) { +- ant16 = true; +- } +- break; +- } +- } + + // make sure we don't have an illegal set of options + validateAttributes(); +@@ -76,18 +61,12 @@ + destFile = new File(destDir, file.getName()); + } + if (!destFile.exists()) +- if (ant16) + fileCopyMap.put(file.getAbsolutePath(), new String[] { destFile.getAbsolutePath() }); +- else +- fileCopyMap.put(file.getAbsolutePath(), destFile.getAbsolutePath()); + + else if (!notReplace && ( forceOverwrite + || (file.lastModified() > destFile.lastModified())) + ) { +- if (ant16) + fileCopyMap.put(file.getAbsolutePath(), new String[] { destFile.getAbsolutePath() }); +- else +- fileCopyMap.put(file.getAbsolutePath(), destFile.getAbsolutePath()); + } + else { + log(file + " omitted as " + destFile + " is up to date.",
