Hello community, here is the log from the commit of package xmlbeans for openSUSE:Factory checked in at 2014-06-26 10:42:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmlbeans (Old) and /work/SRC/openSUSE:Factory/.xmlbeans.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmlbeans" Changes: -------- --- /work/SRC/openSUSE:Factory/xmlbeans/xmlbeans-mini.changes 2013-12-13 13:11:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xmlbeans.new/xmlbeans-mini.changes 2014-06-26 10:42:47.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jun 10 11:02:18 UTC 2014 - [email protected] + +- Version bump to 2.6.0: + * bugfixes + * multithread fixes + * fixed error messages + * more: http://svn.apache.org/viewvc/xmlbeans/trunk/CHANGES.txt?revision=1364789&view=markup +- Rebase xmlbeans-2.4.0-nodownload.patch to apply to new version +- Cleanup with spec-cleaner + +------------------------------------------------------------------- xmlbeans.changes: same change Old: ---- xmlbeans-2.4.0-src.tgz New: ---- xmlbeans-2.6.0-src.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmlbeans-mini.spec ++++++ --- /var/tmp/diff_new_pack.TgDT3j/_old 2014-06-26 10:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.TgDT3j/_new 2014-06-26 10:42:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmlbeans-mini # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,9 +19,8 @@ ##### WARNING: please do not edit this auto generated spec file. Use the xmlbeans.spec! ##### %global bootstrap 1 %global real xmlbeans - Name: xmlbeans-mini -Version: 2.4.0 +Version: 2.6.0 Release: 0 Summary: XML-Java binding tool License: Apache-2.0 @@ -32,25 +31,20 @@ Patch0: xmlbeans-2.4.0-nodownload.patch #PATCH-FIX-UPSTREAM: saxon 9.3+ moved VirtualNode interface Patch1: xmlbeans-saxon-virtualnode.patch -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if %{bootstrap} -Conflicts: xmlbeans -%else -Conflicts: xmlbeans-mini -%endif - BuildRequires: ant >= 1.6 BuildRequires: bea-stax-api BuildRequires: javapackages-tools - +BuildRequires: unzip +#!BuildIgnore: antlr antlr-java +#!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %if %{bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap BuildRequires: xml-commons-resolver-bootstrap +Conflicts: xmlbeans +#!BuildIgnore: xerces-j2-bootstrap #!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver %else BuildRequires: ant-contrib @@ -62,13 +56,10 @@ BuildRequires: saxon9 BuildRequires: xml-commons-resolver >= 1.1 BuildRequires: xmlbeans-mini +Conflicts: xmlbeans-mini #!BuildIgnore: xmlbeans %endif -BuildRequires: unzip -#!BuildIgnore: antlr antlr-java -#!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12 - %description XMLBeans is a tool that allows you to access the full power of XML in a Java friendly way. It is an XML-Java binding tool. The idea is that you @@ -163,9 +154,6 @@ install -p -m 0644 external/lib/oldxbean.jar %{buildroot}%{_javadir}/%{real}/oldxbean.jar %endif #if ! % { bootstrap} -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt README.txt ++++++ xmlbeans.spec ++++++ --- /var/tmp/diff_new_pack.TgDT3j/_old 2014-06-26 10:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.TgDT3j/_new 2014-06-26 10:42:48.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xmlbeans # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,9 +18,8 @@ %global bootstrap 0 %global real xmlbeans - Name: xmlbeans -Version: 2.4.0 +Version: 2.6.0 Release: 0 Summary: XML-Java binding tool License: Apache-2.0 @@ -31,25 +30,20 @@ Patch0: xmlbeans-2.4.0-nodownload.patch #PATCH-FIX-UPSTREAM: saxon 9.3+ moved VirtualNode interface Patch1: xmlbeans-saxon-virtualnode.patch -BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-build - -%if %{bootstrap} -Conflicts: xmlbeans -%else -Conflicts: xmlbeans-mini -%endif - BuildRequires: ant >= 1.6 BuildRequires: bea-stax-api BuildRequires: javapackages-tools - +BuildRequires: unzip +#!BuildIgnore: antlr antlr-java +#!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %if %{bootstrap} BuildRequires: java-1_5_0-gcj-compat-devel -#BuildRequires: xerces-j2-bootstrap -#!BuildIgnore: xerces-j2-bootstrap BuildRequires: xml-commons-apis-bootstrap BuildRequires: xml-commons-resolver-bootstrap +Conflicts: xmlbeans +#!BuildIgnore: xerces-j2-bootstrap #!BuildIgnore: xerces-j2 xml-commons xml-commons-apis xml-commons-resolver %else BuildRequires: ant-contrib @@ -61,13 +55,10 @@ BuildRequires: saxon9 BuildRequires: xml-commons-resolver >= 1.1 BuildRequires: xmlbeans-mini +Conflicts: xmlbeans-mini #!BuildIgnore: xmlbeans %endif -BuildRequires: unzip -#!BuildIgnore: antlr antlr-java -#!BuildIgnore: xml-commons-jaxp-1.3-apis xml-commons-resolver12 - %description XMLBeans is a tool that allows you to access the full power of XML in a Java friendly way. It is an XML-Java binding tool. The idea is that you @@ -162,9 +153,6 @@ install -p -m 0644 external/lib/oldxbean.jar %{buildroot}%{_javadir}/%{real}/oldxbean.jar %endif #if ! % { bootstrap} -%clean -rm -rf %{buildroot} - %files %defattr(-,root,root,-) %doc LICENSE.txt NOTICE.txt README.txt ++++++ xmlbeans-2.4.0-nodownload.patch ++++++ --- /var/tmp/diff_new_pack.TgDT3j/_old 2014-06-26 10:42:48.000000000 +0200 +++ /var/tmp/diff_new_pack.TgDT3j/_new 2014-06-26 10:42:48.000000000 +0200 @@ -1,40 +1,38 @@ -Do not foolishly attempt to download jars from the internets. - -diff -up xmlbeans-2.4.0/build.xml.nodownload xmlbeans-2.4.0/build.xml ---- xmlbeans-2.4.0/build.xml.nodownload 2008-06-10 15:42:37.000000000 +0200 -+++ xmlbeans-2.4.0/build.xml 2009-11-03 15:53:11.000000000 +0100 -@@ -112,7 +112,7 @@ - http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-7-3j.zip - http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip - --> -- <get dest="external/lib/saxonb9-0-0-4j.zip" -+ <!-- get dest="external/lib/saxonb9-0-0-4j.zip" - src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-4j.zip"; - verbose="true" usetimestamp="true" ignoreerrors="true"/> - <unzip src="external/lib/saxonb9-0-0-4j.zip" dest="external/lib/"> -@@ -120,7 +120,7 @@ - <include name="saxon9.jar"/> - <include name="saxon9-dom.jar"/> - </patternset> -- </unzip> -+ </unzip--> - - <copy file="external/lib/saxon9.jar" tofile="build/lib/saxon9.jar"/> - <!-- saxon9-dom.jar is used to register DOMObjectModel --> -@@ -147,14 +147,14 @@ - </condition> - </target> - -- <target name="jsr173_1.0.jars" -+ <target name="jsr173_1.0.jars"><!-- - depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted" - unless="jsr173_1.0.jars.exist"> - <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" > - <patternset> - <include name="jsr173_1.0_api.jar"/> - </patternset> -- </unjar> -+ </unjar!--> - - <!-- copy jsr173 API jar and license files to build/lib --> - <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/> +diff -urN xmlbeans-2.6.0.old/build.xml xmlbeans-2.6.0/build.xml +--- xmlbeans-2.6.0.old/build.xml 2014-06-10 11:27:08.177244937 +0200 ++++ xmlbeans-2.6.0/build.xml 2014-06-10 13:00:38.964763767 +0200 +@@ -113,7 +113,7 @@ + http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-7-3j.zip + http://easynews.dl.sourceforge.net/sourceforge/saxon/saxonb8-8j.zip + --> +- <get dest="external/lib/saxonb9-0-0-4j.zip" ++ <!--get dest="external/lib/saxonb9-0-0-4j.zip" + src="http://prdownloads.sourceforge.net/saxon/saxonb9-0-0-4j.zip"; + verbose="true" usetimestamp="true" ignoreerrors="true"/> + <unzip src="external/lib/saxonb9-0-0-4j.zip" dest="external/lib/"> +@@ -121,7 +121,7 @@ + <include name="saxon9.jar"/> + <include name="saxon9-dom.jar"/> + </patternset> +- </unzip> ++ </unzip--> + + <copy file="external/lib/saxon9.jar" tofile="build/lib/saxon9.jar"/> + <!-- saxon9-dom.jar is used to register DOMObjectModel --> +@@ -148,14 +148,14 @@ + </condition> + </target> + +- <target name="jsr173_1.0.jars" ++ <target name="jsr173_1.0.jars"><!-- + depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted" + unless="jsr173_1.0.jars.exist"> + <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" > + <patternset> + <include name="jsr173_1.0_api.jar"/> + </patternset> +- </unjar> ++ </unjar!--> + + <!-- copy jsr173 API jar and license files to build/lib --> + <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/> ++++++ xmlbeans-2.4.0-src.tgz -> xmlbeans-2.6.0-src.tgz ++++++ /work/SRC/openSUSE:Factory/xmlbeans/xmlbeans-2.4.0-src.tgz /work/SRC/openSUSE:Factory/.xmlbeans.new/xmlbeans-2.6.0-src.tgz differ: char 14, line 1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
