[xmlbeans] Updated to latest version 2.6.0 (#824022)
Matt Spaulding
madsa at fedoraproject.org
Sat Oct 13 20:30:51 UTC 2012
commit 10cb3ba3425f0085afec02017d00de08f06d11f7
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date: Sat Oct 13 13:27:51 2012 -0700
Updated to latest version 2.6.0 (#824022)
Updated java target to 1.5 (#842625)
Updated for current java guidelines
.gitignore | 1 +
sources | 2 +-
xmlbeans-2.4.0-nodownload.patch | 40 -----
xmlbeans-2.6.0-iso-8859-1-encoding.patch | 177 ++++++++++++++++++++
xmlbeans-2.6.0-jsr-bundle.patch | 18 ++
xmlbeans-2.6.0-nodownload.patch | 46 +++++
xmlbeans-2.4.0.pom => xmlbeans-2.6.0.pom | 2 +-
...ublic-2.4.0.pom => xmlbeans-xmlpublic-2.6.0.pom | 70 ++-------
...ans-xpath-2.4.0.pom => xmlbeans-xpath-2.6.0.pom | 70 ++-------
xmlbeans.spec | 26 +++-
10 files changed, 286 insertions(+), 166 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6cda311..bd08e0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xmlbeans-2.4.0-src.tgz
+/xmlbeans-2.6.0-src.tgz
diff --git a/sources b/sources
index b58ff78..c179a77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64412ab1f19d90112335062bfa90f7c8 xmlbeans-2.4.0-src.tgz
+ca20feac6051a2b3a2dea5a85ec261ff xmlbeans-2.6.0-src.tgz
diff --git a/xmlbeans-2.6.0-iso-8859-1-encoding.patch b/xmlbeans-2.6.0-iso-8859-1-encoding.patch
new file mode 100644
index 0000000..5cbdc0e
--- /dev/null
+++ b/xmlbeans-2.6.0-iso-8859-1-encoding.patch
@@ -0,0 +1,177 @@
+Index: xmlbeans-2.6.0/build.xml
+===================================================================
+--- xmlbeans-2.6.0.orig/build.xml
++++ xmlbeans-2.6.0/build.xml
+@@ -18,6 +18,7 @@
+ <property name="build.compiler" value="javac1.4"/>
+ <property name="javac.source" value="1.4"/>
+ <property name="javac.target" value="1.4"/>
++ <property name="javac.encoding" value="iso-8859-1"/>
+
+ <property name="version.base" value="2.6.0"/>
+ <property name="version.rc" value="-RC3"/>
+@@ -292,6 +293,7 @@
+ <javac srcdir="src/zipcompare"
+ source="${javac.source}" target="${javac.target}"
+ destdir="build/private/classes/zipcompare"
++ encoding="${javac.encoding}"
+ debug="on"/>
+ </target>
+
+@@ -536,6 +538,7 @@
+ <javac srcdir="src/xmlinputstream"
+ source="${javac.source}" target="${javac.target}"
+ destdir="build/classes/xmlinputstream"
++ encoding="${javac.encoding}"
+ debug="on">
+ <classpath>
+ <pathelement location="build/classes/common"/>
+@@ -547,7 +550,7 @@
+
+ <target name="xmlpublic.classes" depends="dirs, jsr173_1.0.jars">
+ <mkdir dir="build/classes/xmlpublic"/>
+- <javac srcdir="src/xmlpublic" sourcepath="src/xmlinputstream" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/xmlpublic" sourcepath="src/xmlinputstream" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+ </classpath>
+@@ -584,7 +587,7 @@
+
+ <target name="typestore.classes" depends="dirs, xmlpublic.classes, common.classes, xmlinputstream.classes">
+ <mkdir dir="build/classes/typestore"/>
+- <javac srcdir="src/typestore" destdir="build/classes/typestore" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/typestore" destdir="build/classes/typestore" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+@@ -599,7 +602,7 @@
+
+ <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes, jsr173_1.0.jars">
+ <mkdir dir="build/classes/common"/>
+- <javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+@@ -624,7 +627,7 @@
+
+ <target name="typeholder.template" depends="typeholder.check, xmlpublic.classes" unless="typeholder.notRequired">
+ <mkdir dir="build/classes/typeholder"/>
+- <javac destdir="build/classes/typeholder" source="${javac.source}" target="${javac.target}" debug="off">
++ <javac destdir="build/classes/typeholder" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="off">
+ <classpath>
+ <pathelement location="build/classes/xmlpublic"/>
+ </classpath>
+@@ -641,7 +644,7 @@
+ repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
+ configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes">
+ <mkdir dir="build/classes/typeimpl"/>
+- <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath>
+ <pathelement location="build/classes/store"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+@@ -679,7 +682,7 @@
+
+ <target name="xmlcomp.classes" depends="dirs, repackage.classes, typeimpl.classes, xmlpublic.classes, typestore.classes">
+ <mkdir dir="build/classes/xmlcomp"/>
+- <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+ <pathelement location="build/classes/xmlinputstream"/>
+@@ -699,7 +702,7 @@
+
+ <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes, jsr173_1.0.jars">
+ <mkdir dir="build/classes/marshal"/>
+- <javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+ <pathelement location="build/classes/configschema"/>
+@@ -716,7 +719,7 @@
+ <!-- support for running JAM under JDK1.5 ========================= -->
+
+ <target name="jamsupport.classes" depends="dirs,jam.classes">
+- <javac srcdir="src/jamsupport" destdir="build/classes/jam" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/jamsupport" destdir="build/classes/jam" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath id="jamsupport.compile.path">
+ <pathelement location="build/classes/jam"/>
+ </classpath>
+@@ -727,7 +730,7 @@
+
+ <target name="saaj_api.classes" depends="dirs">
+ <mkdir dir="build/classes/saaj_api"/>
+- <javac srcdir="src/saaj_api" destdir="build/classes/saaj_api" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/saaj_api" destdir="build/classes/saaj_api" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath id="saaj_api.compile.path">
+ <pathelement location="build/classes/common"/>
+ <pathelement location="build/classes/xmlpublic"/>
+@@ -740,7 +743,7 @@
+ <target name="store.classes"
+ depends="dirs, common.classes, xmlpublic.classes, typestore.classes, saaj_api.classes, piccolo.classes">
+ <mkdir dir="build/classes/store"/>
+- <javac srcdir="src/store" destdir="build/classes/store" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/store" destdir="build/classes/store" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath id="store.compile.path">
+ <pathelement location="build/classes/typestore"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+@@ -759,7 +762,7 @@
+ depends="dirs, common.classes, xmlpublic.classes, typestore.classes, saaj_api.classes, piccolo.classes,
+ typeimpl.classes, xmlcomp.classes">
+ <mkdir dir="build/classes/tools"/>
+- <javac srcdir="src/tools" destdir="build/classes/tools" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/tools" destdir="build/classes/tools" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath id="tools.compile.path">
+ <pathelement location="build/classes/typestore"/>
+ <pathelement location="build/lib/jsr173_1.0_api.jar"/>
+@@ -847,7 +850,7 @@
+
+ <target name="xmlconfig.classes" depends="dirs, xmlpublic.classes, configschema.classes">
+ <mkdir dir="build/classes/xmlconfig"/>
+- <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="${javac.source}" target="${javac.target}" debug="on">
++ <javac srcdir="src/xmlconfig" destdir="build/classes/xmlconfig" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on">
+ <classpath>
+ <pathelement location="build/classes/xmlpublic"/>
+ <pathelement location="build/classes/configschema"/>
+@@ -972,7 +975,7 @@
+
+ <target name="repackage.classes">
+ <mkdir dir="build/classes/repackage"/>
+- <javac srcdir="src/repackage" destdir="build/classes/repackage" source="${javac.source}" target="${javac.target}" debug="on"/>
++ <javac srcdir="src/repackage" destdir="build/classes/repackage" source="${javac.source}" target="${javac.target}" encoding="${javac.encoding}" debug="on"/>
+ </target>
+
+ <!-- xpath target ============================================= -->
+@@ -991,6 +994,7 @@
+ destdir="build/classes/xpath_xquery"
+ classpathref="xpath.compile.path"
+ source="${javac.source}" target="${javac.target}"
++ encoding="${javac.encoding}"
+ debug="on">
+ <src path="src/xpath_xquery"/>
+ <classpath id="xpath.compile.path">
+@@ -1079,6 +1083,7 @@
+ destdir="build/private/classes/drt"
+ classpathref="test.compile.path"
+ source="${javac.source}" target="${javac.target}"
++ encoding="${javac.encoding}"
+ debug="on">
+ <src path="test/src/drt"/>
+ </javac>
+@@ -1138,6 +1143,7 @@
+ <javac
+ destdir="build/classes/jam"
+ source="1.4" target="1.4"
++ encoding="${javac.encoding}"
+ debug="on">
+ <src path="build/private/jam/src_repackage"/>
+ <classpath>
+@@ -1174,6 +1180,7 @@
+ destdir="build/classes/piccolo"
+ classpath=""
+ source="1.3" target="1.4"
++ encoding="${javac.encoding}"
+ debug="on">
+ <src path="build/private/piccolo/src_repackage"/>
+ </javac>
diff --git a/xmlbeans-2.6.0-jsr-bundle.patch b/xmlbeans-2.6.0-jsr-bundle.patch
new file mode 100644
index 0000000..d75d571
--- /dev/null
+++ b/xmlbeans-2.6.0-jsr-bundle.patch
@@ -0,0 +1,18 @@
+Index: xmlbeans-2.6.0/build.xml
+===================================================================
+--- xmlbeans-2.6.0.orig/build.xml
++++ xmlbeans-2.6.0/build.xml
+@@ -152,11 +152,11 @@
+ <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" >
++ <!-- 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 --git a/xmlbeans-2.6.0-nodownload.patch b/xmlbeans-2.6.0-nodownload.patch
new file mode 100644
index 0000000..c828fe4
--- /dev/null
+++ b/xmlbeans-2.6.0-nodownload.patch
@@ -0,0 +1,46 @@
+Index: xmlbeans-2.6.0/build.xml
+===================================================================
+--- xmlbeans-2.6.0.orig/build.xml
++++ xmlbeans-2.6.0/build.xml
+@@ -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 -->
+@@ -137,9 +137,9 @@
+ <target name="jsr173-bundle.jar"
+ depends="jsr173-bundle.downloaded, dirs"
+ unless="jsr173-bundle.exists">
+- <get dest="external/lib/jsr173_1.0_api_bundle.jar"
++ <!--get dest="external/lib/jsr173_1.0_api_bundle.jar"
+ src="http://www.apache.org/dist/java-repository/xmlbeans/jars/jsr173_1.0_api_bundle.jar"
+- verbose="true" usetimestamp="true" ignoreerrors="true"/>
++ verbose="true" usetimestamp="true" ignoreerrors="true"/ -->
+ </target>
+
+ <target name="jsr173_1.0.jars.extracted">
+@@ -169,9 +169,9 @@
+ </target>
+
+ <target name="xcresolver.zip" depends="check.xcresolver.zip, dirs" unless="xcresolver.zip.exists">
+- <get dest="external/lib/xcresolver.zip"
++ <!-- get dest="external/lib/xcresolver.zip"
+ src="http://www.apache.org/dist/xml/commons/binaries/xml-commons-resolver-1.1.zip"
+- verbose="true" usetimestamp="true" ignoreerrors="true"/>
++ verbose="true" usetimestamp="true" ignoreerrors="true"/ -->
+ </target>
+
+ <target name="check.resolver.jar">
diff --git a/xmlbeans-2.4.0.pom b/xmlbeans-2.6.0.pom
similarity index 99%
rename from xmlbeans-2.4.0.pom
rename to xmlbeans-2.6.0.pom
index 24429b7..9773fe6 100644
--- a/xmlbeans-2.4.0.pom
+++ b/xmlbeans-2.6.0.pom
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans</artifactId>
- <version>2.4.0</version>
+ <version>2.6.0</version>
<name>XmlBeans</name>
<description>XmlBeans main jar</description>
diff --git a/xmlbeans-xmlpublic-2.4.0.pom b/xmlbeans-xmlpublic-2.6.0.pom
similarity index 59%
rename from xmlbeans-xmlpublic-2.4.0.pom
rename to xmlbeans-xmlpublic-2.6.0.pom
index d319c4f..c1958b2 100644
--- a/xmlbeans-xmlpublic-2.4.0.pom
+++ b/xmlbeans-xmlpublic-2.6.0.pom
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans-xmlpublic</artifactId>
- <version>2.4.0</version>
+ <version>2.6.0</version>
<name>XmlPublic</name>
<description>XmlBeans Public interfaces</description>
@@ -57,44 +57,14 @@
<developer>
<name>Cezar Andrei</name>
<id>cezar</id>
- <email>cezar.andrei at no#spam#!bea.com</email>
+ <email>cezar.andrei at no#spam#!gma|l.com</email>
<organization></organization>
</developer>
<developer>
- <name>David Bau</name>
- <id>dbau</id>
- <email>david.bau at no#spam.google.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Patrick Calahan</name>
- <id></id>
- <email>pcal at no#spam.bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Yana Kadiyska</name>
- <id></id>
- <email>ykadiysk at no#spam#!bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Ken Kress</name>
- <id></id>
- <email>ken at nos#pam.kress.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Kevin Krouse</name>
- <id></id>
- <email>kkrouse at n#osp#am.apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Laurence Moroney</name>
- <id></id>
- <email>laurence.moroney at nospa#m.reuters.com</email>
+ <name>Radu Preotiuc</name>
+ <id>radup</id>
+ <email>radupr at nos#pam.gm at il.com</email>
<organization></organization>
</developer>
<developer>
@@ -104,33 +74,15 @@
<organization></organization>
</developer>
<developer>
- <name>Cliff Schmidt</name>
- <id></id>
- <email>cliffschmidt at n#osp#am!gmail.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Dutta Satadip</name>
- <id></id>
- <email>s-dutta at no#spam.sbcglobal.net</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Eric Vasilik</name>
- <id></id>
- <email>eric at nos#pam.vasilik.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>David Waite</name>
- <id></id>
- <email>dwaite at no#spam.apache.org</email>
+ <name>Wing Yew Poon</name>
+ <id>wpoon</id>
+ <email>wing-yew.poon at nos#pam.oracle.com</email>
<organization></organization>
</developer>
<developer>
- <name>Scott Ziegler</name>
- <id></id>
- <email>scott.ziegler at n#ospam.bea.com</email>
+ <name>Jacob Danner</name>
+ <id>jdanner</id>
+ <email>jacob.danner at nos#pam.oracle.com</email>
<organization></organization>
</developer>
diff --git a/xmlbeans-xpath-2.4.0.pom b/xmlbeans-xpath-2.6.0.pom
similarity index 60%
rename from xmlbeans-xpath-2.4.0.pom
rename to xmlbeans-xpath-2.6.0.pom
index 115e50f..7bfec71 100644
--- a/xmlbeans-xpath-2.4.0.pom
+++ b/xmlbeans-xpath-2.6.0.pom
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.xmlbeans</groupId>
<artifactId>xmlbeans-xpath</artifactId>
- <version>2.4.0</version>
+ <version>2.6.0</version>
<name>XmlBeansXPath</name>
<description>XmlBeans extended XPath and XQuery support</description>
@@ -57,44 +57,14 @@
<developer>
<name>Cezar Andrei</name>
<id>cezar</id>
- <email>cezar.andrei at no#spam#!bea.com</email>
+ <email>cezar.andrei at no#spam#!gma|l.com</email>
<organization></organization>
</developer>
<developer>
- <name>David Bau</name>
- <id>dbau</id>
- <email>david.bau at no#spam.google.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Patrick Calahan</name>
- <id></id>
- <email>pcal at no#spam.bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Yana Kadiyska</name>
- <id></id>
- <email>ykadiysk at no#spam#!bea.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Ken Kress</name>
- <id></id>
- <email>ken at nos#pam.kress.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Kevin Krouse</name>
- <id></id>
- <email>kkrouse at n#osp#am.apache.org</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Laurence Moroney</name>
- <id></id>
- <email>laurence.moroney at nospa#m.reuters.com</email>
+ <name>Radu Preotiuc</name>
+ <id>radup</id>
+ <email>radupr at nos#pam.gm at il.com</email>
<organization></organization>
</developer>
<developer>
@@ -104,33 +74,15 @@
<organization></organization>
</developer>
<developer>
- <name>Cliff Schmidt</name>
- <id></id>
- <email>cliffschmidt at n#osp#am!gmail.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Dutta Satadip</name>
- <id></id>
- <email>s-dutta at no#spam.sbcglobal.net</email>
- <organization></organization>
- </developer>
- <developer>
- <name>Eric Vasilik</name>
- <id></id>
- <email>eric at nos#pam.vasilik.com</email>
- <organization></organization>
- </developer>
- <developer>
- <name>David Waite</name>
- <id></id>
- <email>dwaite at no#spam.apache.org</email>
+ <name>Wing Yew Poon</name>
+ <id>wpoon</id>
+ <email>wing-yew.poon at nos#pam.oracle.com</email>
<organization></organization>
</developer>
<developer>
- <name>Scott Ziegler</name>
- <id></id>
- <email>scott.ziegler at n#ospam.bea.com</email>
+ <name>Jacob Danner</name>
+ <id>jdanner</id>
+ <email>jacob.danner at nos#pam.oracle.com</email>
<organization></organization>
</developer>
diff --git a/xmlbeans.spec b/xmlbeans.spec
index 0fee289..2916651 100644
--- a/xmlbeans.spec
+++ b/xmlbeans.spec
@@ -31,31 +31,36 @@
%bcond_with bootstrap
Name: xmlbeans
-Version: 2.4.0
-Release: 10%{?dist}%{?with_bootstrap:.boot}
+Version: 2.6.0
+Release: 1%{?dist}%{?with_bootstrap:.boot}
Summary: XML-Java binding tool
Group: Development/Libraries
URL: http://xmlbeans.apache.org/
Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz
-Source1: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}/%{version}/%{name}-%{version}.pom
+# Pom file is not available from maven repository for the
+# currently released version
+Source1: %{version}/%{name}-%{version}.pom
Source2: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}-xpath/%{version}/%{name}-xpath-%{version}.pom
Source3: http://repo1.maven.org/maven2/org/apache/%{name}/%{name}-xmlpublic/%{version}/%{name}-xmlpublic-%{version}.pom
-Patch0: xmlbeans-2.4.0-nodownload.patch
+Patch0: xmlbeans-2.6.0-nodownload.patch
Patch1: 0001-Update-to-newer-saxon-API.patch
+Patch2: xmlbeans-2.6.0-iso-8859-1-encoding.patch
+Patch3: xmlbeans-2.6.0-jsr-bundle.patch
License: ASL 2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if %without bootstrap
BuildRequires: xmlbeans
%endif
+BuildRequires: java-devel
BuildRequires: jpackage-utils >= 0:1.5
BuildRequires: ant >= 0:1.6, ant-junit, ant-contrib, junit
BuildRequires: ant >= 0:1.6, ant-junit, junit
BuildRequires: xml-commons-resolver >= 0:1.1
BuildRequires: bea-stax-api
BuildRequires: saxon >= 8
-BuildRequires: java-devel-openjdk
Requires: jpackage-utils >= 0:1.6
+Requires: java
BuildArch: noarch
@@ -82,6 +87,7 @@ Object model.
Summary: Javadoc for %{name}
Group: Documentation
Requires: %{name} = %{version}-%{release}
+Requires: jpackage-utils
%description javadoc
%{summary}.
@@ -108,6 +114,8 @@ Requires: %{name} = %{version}-%{release}
%setup -q -n %{name}-%{version}
%patch0 -p1 -b .nodownload
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
@@ -130,7 +138,7 @@ ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar
sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css
# Build
-ant default docs
+ant -Djavac.source=1.5 -Djavac.target=1.5 default docs
%install
rm -rf $RPM_BUILD_ROOT
@@ -208,6 +216,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Oct 13 2012 Matt Spaulding <mspaulding06 at gmail.com> - 2.6.0-1
+- Updated to latest version 2.6.0 (#824022)
+- Compiles with target 1.5 (#842625)
+- Source encoding properly set as ISO-8859-1
+- Updated Requires and BR for current java guidelines
+
* Mon May 28 2012 gil cattaneo <puntogil at libero.it> - 2.4.0-10
- Add maven POMs, RHBZ#825844
More information about the scm-commits
mailing list