From 24f2d9ae3311f76bad7fe81a66e385cc9e1b4aad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:55:56 +0000 Subject: [PATCH 01/29] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 8db5941..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlbeans -# $Id$ -NAME := xmlbeans -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From dfc6703918ce3e18bd8d5061ba2a99cef91801b4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:28:38 -0600 Subject: [PATCH 02/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 6df3a18..fc74b5e 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -32,7 +32,7 @@ Name: xmlbeans Version: 2.4.0 -Release: 6%{?dist}%{?with_bootstrap:.boot} +Release: 7%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool Group: Development/Libraries URL: http://xmlbeans.apache.org/ @@ -194,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 2.4.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Dec 09 2009 Lubomir Rintel - 2.4.0-6 - Rebuild without bootstrapping From 53a0d9c1bee34eab0f21234bdf27114f4da26cf6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 03:03:03 -0600 Subject: [PATCH 03/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index fc74b5e..3f11547 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -32,7 +32,7 @@ Name: xmlbeans Version: 2.4.0 -Release: 7%{?dist}%{?with_bootstrap:.boot} +Release: 8%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool Group: Development/Libraries URL: http://xmlbeans.apache.org/ @@ -194,6 +194,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 2.4.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Feb 07 2011 Fedora Release Engineering - 2.4.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From f2797f67ea23f33317a25a5ce7b94b2a960896d5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 23 May 2012 12:18:57 +0200 Subject: [PATCH 04/29] Update to newer saxon API --- 0001-Update-to-newer-saxon-API.patch | 25 +++++++++++++++++++++++++ xmlbeans.spec | 7 ++++++- 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 0001-Update-to-newer-saxon-API.patch diff --git a/0001-Update-to-newer-saxon-API.patch b/0001-Update-to-newer-saxon-API.patch new file mode 100644 index 0000000..09e1ef1 --- /dev/null +++ b/0001-Update-to-newer-saxon-API.patch @@ -0,0 +1,25 @@ +From c06b729673544826892266c5778227a47c495d49 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Wed, 23 May 2012 11:54:56 +0200 +Subject: [PATCH] Update to newer saxon API + +--- + .../xmlbeans/impl/xpath/saxon/XBeansXPath.java | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java b/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java +index f210e95..b972c85 100644 +--- a/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java ++++ b/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java +@@ -27,7 +27,7 @@ import org.w3c.dom.Node; + import net.sf.saxon.Configuration; + import net.sf.saxon.dom.NodeWrapper; + import net.sf.saxon.om.NodeInfo; +-import net.sf.saxon.om.VirtualNode; ++import net.sf.saxon.tree.wrapper.VirtualNode; + import net.sf.saxon.om.Item; + import net.sf.saxon.value.Value; + import net.sf.saxon.sxpath.XPathEvaluator; +-- +1.7.7.6 + diff --git a/xmlbeans.spec b/xmlbeans.spec index 3f11547..e773325 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -32,12 +32,13 @@ Name: xmlbeans Version: 2.4.0 -Release: 8%{?dist}%{?with_bootstrap:.boot} +Release: 9%{?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 Patch0: xmlbeans-2.4.0-nodownload.patch +Patch1: 0001-Update-to-newer-saxon-API.patch License: ASL 2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -103,6 +104,7 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q -n %{name}-%{version} %patch0 -p1 -b .nodownload +%patch1 -p1 %build @@ -194,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed May 23 2012 Mikolaj Izdebski - 2.4.0-9 +- Update to newer saxon API + * Sat Jan 14 2012 Fedora Release Engineering - 2.4.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From effd440c8083f71f6afd65975be3d24e65f9283f Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 23 May 2012 14:29:42 +0200 Subject: [PATCH 05/29] Fix some weird whitespace issues in patch --- 0001-Update-to-newer-saxon-API.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/0001-Update-to-newer-saxon-API.patch b/0001-Update-to-newer-saxon-API.patch index 09e1ef1..ad79a95 100644 --- a/0001-Update-to-newer-saxon-API.patch +++ b/0001-Update-to-newer-saxon-API.patch @@ -12,14 +12,14 @@ index f210e95..b972c85 100644 --- a/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java +++ b/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java @@ -27,7 +27,7 @@ import org.w3c.dom.Node; - import net.sf.saxon.Configuration; - import net.sf.saxon.dom.NodeWrapper; - import net.sf.saxon.om.NodeInfo; --import net.sf.saxon.om.VirtualNode; -+import net.sf.saxon.tree.wrapper.VirtualNode; - import net.sf.saxon.om.Item; - import net.sf.saxon.value.Value; - import net.sf.saxon.sxpath.XPathEvaluator; + import net.sf.saxon.Configuration; + import net.sf.saxon.dom.NodeWrapper; + import net.sf.saxon.om.NodeInfo; +-import net.sf.saxon.om.VirtualNode; ++import net.sf.saxon.tree.wrapper.VirtualNode; + import net.sf.saxon.om.Item; + import net.sf.saxon.value.Value; + import net.sf.saxon.sxpath.XPathEvaluator; -- 1.7.7.6 From 75e8f6e2e54e279a90c144567054feb9fc6e2973 Mon Sep 17 00:00:00 2001 From: gil Date: Mon, 28 May 2012 17:14:51 +0200 Subject: [PATCH 06/29] Add maven POMs --- xmlbeans-2.4.0.pom | 147 +++++++++++++++++++++++++++++++++ xmlbeans-xmlpublic-2.4.0.pom | 147 +++++++++++++++++++++++++++++++++ xmlbeans-xpath-2.4.0.pom | 152 +++++++++++++++++++++++++++++++++++ xmlbeans.spec | 21 ++++- 4 files changed, 464 insertions(+), 3 deletions(-) create mode 100644 xmlbeans-2.4.0.pom create mode 100644 xmlbeans-xmlpublic-2.4.0.pom create mode 100644 xmlbeans-xpath-2.4.0.pom diff --git a/xmlbeans-2.4.0.pom b/xmlbeans-2.4.0.pom new file mode 100644 index 0000000..24429b7 --- /dev/null +++ b/xmlbeans-2.4.0.pom @@ -0,0 +1,147 @@ + + 4.0.0 + org.apache.xmlbeans + xmlbeans + 2.4.0 + + XmlBeans + XmlBeans main jar + http://xmlbeans.apache.org + + + jira + http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10436 + + + + + XmlBeans User List + user-subscribe@xmlbeans.apache.org + users-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-user/ + + + XmlBeans Developer List + dev-subscribe@xmlbeans.apache.org + dev-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-dev/ + + + Source Control List + commits-subscribe@xmlbeans.apache.org + commits-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-commits/ + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:svn:https://svn.apache.org/repos/asf/xmlbeans/ + scm:svn:https://${maven.username}@svn.apache.org/repos/asf/xmlbeans/ + https://svn.apache.org/repos/asf/xmlbeans/ + + + + XmlBeans + http://xmlbeans.apache.org/ + + + + + Cezar Andrei + cezar + cezar.andrei@no#spam#!bea.com + + + + + David Bau + dbau + david.bau@no#spam.google.com + + + + Patrick Calahan + + pcal@no#spam.bea.com + + + + Yana Kadiyska + + ykadiysk@no#spam#!bea.com + + + + Ken Kress + + ken@nos#pam.kress.org + + + + Kevin Krouse + + kkrouse@n#osp#am.apache.org + + + + Laurence Moroney + + laurence.moroney@nospa#m.reuters.com + + + + Radu Preotiuc + radup + radu.preotiuc-pietro@nos#pam.bea.com + + + + Cliff Schmidt + + cliffschmidt@n#osp#am!gmail.com + + + + Dutta Satadip + + s-dutta@no#spam.sbcglobal.net + + + + Eric Vasilik + + eric@nos#pam.vasilik.com + + + + David Waite + + dwaite@no#spam.apache.org + + + + Scott Ziegler + + scott.ziegler@n#ospam.bea.com + + + + + + + + stax + stax-api + 1.0.1 + + + + diff --git a/xmlbeans-xmlpublic-2.4.0.pom b/xmlbeans-xmlpublic-2.4.0.pom new file mode 100644 index 0000000..d319c4f --- /dev/null +++ b/xmlbeans-xmlpublic-2.4.0.pom @@ -0,0 +1,147 @@ + + 4.0.0 + org.apache.xmlbeans + xmlbeans-xmlpublic + 2.4.0 + + XmlPublic + XmlBeans Public interfaces + http://xmlbeans.apache.org + + + jira + http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10436 + + + + + XmlBeans User List + user-subscribe@xmlbeans.apache.org + users-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-user/ + + + XmlBeans Developer List + dev-subscribe@xmlbeans.apache.org + dev-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-dev/ + + + Source Control List + commits-subscribe@xmlbeans.apache.org + commits-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-commits/ + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:svn:https://svn.apache.org/repos/asf/xmlbeans/ + scm:svn:https://${maven.username}@svn.apache.org/repos/asf/xmlbeans/ + https://svn.apache.org/repos/asf/xmlbeans/ + + + + XmlBeans + http://xmlbeans.apache.org/ + + + + + Cezar Andrei + cezar + cezar.andrei@no#spam#!bea.com + + + + + David Bau + dbau + david.bau@no#spam.google.com + + + + Patrick Calahan + + pcal@no#spam.bea.com + + + + Yana Kadiyska + + ykadiysk@no#spam#!bea.com + + + + Ken Kress + + ken@nos#pam.kress.org + + + + Kevin Krouse + + kkrouse@n#osp#am.apache.org + + + + Laurence Moroney + + laurence.moroney@nospa#m.reuters.com + + + + Radu Preotiuc + radup + radu.preotiuc-pietro@nos#pam.bea.com + + + + Cliff Schmidt + + cliffschmidt@n#osp#am!gmail.com + + + + Dutta Satadip + + s-dutta@no#spam.sbcglobal.net + + + + Eric Vasilik + + eric@nos#pam.vasilik.com + + + + David Waite + + dwaite@no#spam.apache.org + + + + Scott Ziegler + + scott.ziegler@n#ospam.bea.com + + + + + + + + stax + stax-api + 1.0.1 + + + + diff --git a/xmlbeans-xpath-2.4.0.pom b/xmlbeans-xpath-2.4.0.pom new file mode 100644 index 0000000..115e50f --- /dev/null +++ b/xmlbeans-xpath-2.4.0.pom @@ -0,0 +1,152 @@ + + 4.0.0 + org.apache.xmlbeans + xmlbeans-xpath + 2.4.0 + + XmlBeansXPath + XmlBeans extended XPath and XQuery support + http://xmlbeans.apache.org + + + jira + http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10436 + + + + + XmlBeans User List + user-subscribe@xmlbeans.apache.org + users-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-user/ + + + XmlBeans Developer List + dev-subscribe@xmlbeans.apache.org + dev-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-dev/ + + + Source Control List + commits-subscribe@xmlbeans.apache.org + commits-unsubscribe@xmlbeans.apache.org + http://mail-archives.apache.org/mod_mbox/xmlbeans-commits/ + + + + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + scm:svn:https://svn.apache.org/repos/asf/xmlbeans/ + scm:svn:https://${maven.username}@svn.apache.org/repos/asf/xmlbeans/ + https://svn.apache.org/repos/asf/xmlbeans/ + + + + XmlBeans + http://xmlbeans.apache.org/ + + + + + Cezar Andrei + cezar + cezar.andrei@no#spam#!bea.com + + + + + David Bau + dbau + david.bau@no#spam.google.com + + + + Patrick Calahan + + pcal@no#spam.bea.com + + + + Yana Kadiyska + + ykadiysk@no#spam#!bea.com + + + + Ken Kress + + ken@nos#pam.kress.org + + + + Kevin Krouse + + kkrouse@n#osp#am.apache.org + + + + Laurence Moroney + + laurence.moroney@nospa#m.reuters.com + + + + Radu Preotiuc + radup + radu.preotiuc-pietro@nos#pam.bea.com + + + + Cliff Schmidt + + cliffschmidt@n#osp#am!gmail.com + + + + Dutta Satadip + + s-dutta@no#spam.sbcglobal.net + + + + Eric Vasilik + + eric@nos#pam.vasilik.com + + + + David Waite + + dwaite@no#spam.apache.org + + + + Scott Ziegler + + scott.ziegler@n#ospam.bea.com + + + + + + + + org.apache.xmlbeans + xmlbeans + 2.4.0 + + + net.sf.saxon + saxon + 9 + + + + diff --git a/xmlbeans.spec b/xmlbeans.spec index e773325..0fee289 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -32,11 +32,14 @@ Name: xmlbeans Version: 2.4.0 -Release: 9%{?dist}%{?with_bootstrap:.boot} +Release: 10%{?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 +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 Patch1: 0001-Update-to-newer-saxon-API.patch License: ASL 2.0 @@ -124,12 +127,11 @@ ln -sf $(build-classpath saxon) external/lib/saxon9.jar ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar # Fix CRLF -sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css +sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css # Build ant default docs - %install rm -rf $RPM_BUILD_ROOT @@ -142,6 +144,14 @@ ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar +mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} +install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-xbean.pom +%add_maven_depmap JPP.%{name}-xbean.pom %{name}/xbean.jar +install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-xbean_xpath.pom +%add_maven_depmap JPP.%{name}-xbean_xpath.pom %{name}/xbean_xpath.jar +install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-xmlpublic.pom +%add_maven_depmap JPP.%{name}-xmlpublic.pom %{name}/xmlpublic.jar + # bin install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} install -p -m 0755 bin/dumpxsb $RPM_BUILD_ROOT%{_bindir} @@ -177,6 +187,8 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %{_javadir}/* +%{_mavenpomdir}/JPP.%{name}-*.pom +%{_mavendepmapfragdir}/%{name} %doc LICENSE.txt NOTICE.txt README.txt @@ -196,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon May 28 2012 gil cattaneo - 2.4.0-10 +- Add maven POMs, RHBZ#825844 + * Wed May 23 2012 Mikolaj Izdebski - 2.4.0-9 - Update to newer saxon API From 10cb3ba3425f0085afec02017d00de08f06d11f7 Mon Sep 17 00:00:00 2001 From: Matt Spaulding Date: Sat, 13 Oct 2012 13:27:51 -0700 Subject: [PATCH 07/29] 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 +- ...-2.4.0.pom => xmlbeans-xmlpublic-2.6.0.pom | 70 ++----- ...path-2.4.0.pom => xmlbeans-xpath-2.6.0.pom | 70 ++----- xmlbeans.spec | 26 ++- 10 files changed, 286 insertions(+), 166 deletions(-) delete mode 100644 xmlbeans-2.4.0-nodownload.patch create mode 100644 xmlbeans-2.6.0-iso-8859-1-encoding.patch create mode 100644 xmlbeans-2.6.0-jsr-bundle.patch create mode 100644 xmlbeans-2.6.0-nodownload.patch rename xmlbeans-2.4.0.pom => xmlbeans-2.6.0.pom (99%) rename xmlbeans-xmlpublic-2.4.0.pom => xmlbeans-xmlpublic-2.6.0.pom (59%) rename xmlbeans-xpath-2.4.0.pom => xmlbeans-xpath-2.6.0.pom (60%) 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.4.0-nodownload.patch b/xmlbeans-2.4.0-nodownload.patch deleted file mode 100644 index f89aa6f..0000000 --- a/xmlbeans-2.4.0-nodownload.patch +++ /dev/null @@ -1,40 +0,0 @@ -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 - --> -- - -@@ -120,7 +120,7 @@ - - - -- -+ - - - -@@ -147,14 +147,14 @@ - - - -- - - - 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 @@ + + + ++ + + + +@@ -292,6 +293,7 @@ + + + +@@ -536,6 +538,7 @@ + + + +@@ -547,7 +550,7 @@ + + + +- ++ + + + +@@ -584,7 +587,7 @@ + + + +- ++ + + + +@@ -599,7 +602,7 @@ + + + +- ++ + + + +@@ -624,7 +627,7 @@ + + + +- ++ + + + +@@ -641,7 +644,7 @@ + repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes, + configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes"> + +- ++ + + + +@@ -679,7 +682,7 @@ + + + +- ++ + + + +@@ -699,7 +702,7 @@ + + + +- ++ + + + +@@ -716,7 +719,7 @@ + + + +- ++ + + + +@@ -727,7 +730,7 @@ + + + +- ++ + + + +@@ -740,7 +743,7 @@ + + +- ++ + + + +@@ -759,7 +762,7 @@ + depends="dirs, common.classes, xmlpublic.classes, typestore.classes, saaj_api.classes, piccolo.classes, + typeimpl.classes, xmlcomp.classes"> + +- ++ + + + +@@ -847,7 +850,7 @@ + + + +- ++ + + + +@@ -972,7 +975,7 @@ + + + +- ++ + + + +@@ -991,6 +994,7 @@ + destdir="build/classes/xpath_xquery" + classpathref="xpath.compile.path" + source="${javac.source}" target="${javac.target}" ++ encoding="${javac.encoding}" + debug="on"> + + +@@ -1079,6 +1083,7 @@ + destdir="build/private/classes/drt" + classpathref="test.compile.path" + source="${javac.source}" target="${javac.target}" ++ encoding="${javac.encoding}" + debug="on"> + + +@@ -1138,6 +1143,7 @@ + + + +@@ -1174,6 +1180,7 @@ + destdir="build/classes/piccolo" + classpath="" + source="1.3" target="1.4" ++ encoding="${javac.encoding}" + debug="on"> + + 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 @@ + +- ++ + + + 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 + --> +- + +@@ -121,7 +121,7 @@ + + + +- ++ + + + +@@ -137,9 +137,9 @@ + +- ++ verbose="true" usetimestamp="true" ignoreerrors="true"/ --> + + + +@@ -169,9 +169,9 @@ + + + +- ++ verbose="true" usetimestamp="true" ignoreerrors="true"/ --> + + + 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 @@ 4.0.0 org.apache.xmlbeans xmlbeans - 2.4.0 + 2.6.0 XmlBeans XmlBeans main jar 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 @@ 4.0.0 org.apache.xmlbeans xmlbeans-xmlpublic - 2.4.0 + 2.6.0 XmlPublic XmlBeans Public interfaces @@ -57,44 +57,14 @@ Cezar Andrei cezar - cezar.andrei@no#spam#!bea.com + cezar.andrei@no#spam#!gma|l.com - David Bau - dbau - david.bau@no#spam.google.com - - - - Patrick Calahan - - pcal@no#spam.bea.com - - - - Yana Kadiyska - - ykadiysk@no#spam#!bea.com - - - - Ken Kress - - ken@nos#pam.kress.org - - - - Kevin Krouse - - kkrouse@n#osp#am.apache.org - - - - Laurence Moroney - - laurence.moroney@nospa#m.reuters.com + Radu Preotiuc + radup + radupr@nos#pam.gm@il.com @@ -104,33 +74,15 @@ - Cliff Schmidt - - cliffschmidt@n#osp#am!gmail.com + Wing Yew Poon + wpoon + wing-yew.poon@nos#pam.oracle.com - Dutta Satadip - - s-dutta@no#spam.sbcglobal.net - - - - Eric Vasilik - - eric@nos#pam.vasilik.com - - - - David Waite - - dwaite@no#spam.apache.org - - - - Scott Ziegler - - scott.ziegler@n#ospam.bea.com + Jacob Danner + jdanner + jacob.danner@nos#pam.oracle.com 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 @@ 4.0.0 org.apache.xmlbeans xmlbeans-xpath - 2.4.0 + 2.6.0 XmlBeansXPath XmlBeans extended XPath and XQuery support @@ -57,44 +57,14 @@ Cezar Andrei cezar - cezar.andrei@no#spam#!bea.com + cezar.andrei@no#spam#!gma|l.com - David Bau - dbau - david.bau@no#spam.google.com - - - - Patrick Calahan - - pcal@no#spam.bea.com - - - - Yana Kadiyska - - ykadiysk@no#spam#!bea.com - - - - Ken Kress - - ken@nos#pam.kress.org - - - - Kevin Krouse - - kkrouse@n#osp#am.apache.org - - - - Laurence Moroney - - laurence.moroney@nospa#m.reuters.com + Radu Preotiuc + radup + radupr@nos#pam.gm@il.com @@ -104,33 +74,15 @@ - Cliff Schmidt - - cliffschmidt@n#osp#am!gmail.com + Wing Yew Poon + wpoon + wing-yew.poon@nos#pam.oracle.com - Dutta Satadip - - s-dutta@no#spam.sbcglobal.net - - - - Eric Vasilik - - eric@nos#pam.vasilik.com - - - - David Waite - - dwaite@no#spam.apache.org - - - - Scott Ziegler - - scott.ziegler@n#ospam.bea.com + Jacob Danner + jdanner + jacob.danner@nos#pam.oracle.com 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 - 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 - 2.4.0-10 - Add maven POMs, RHBZ#825844 From 96af8a1ad4795862083a9466ac0f52ac7b7b7178 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 21:49:46 -0600 Subject: [PATCH 08/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 2916651..543e986 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -32,7 +32,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 1%{?dist}%{?with_bootstrap:.boot} +Release: 2%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool Group: Development/Libraries URL: http://xmlbeans.apache.org/ @@ -216,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 2.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Oct 13 2012 Matt Spaulding - 2.6.0-1 - Updated to latest version 2.6.0 (#824022) - Compiles with target 1.5 (#842625) From 8cfea08bdbc5c0aef5c3925c1196dec5cd3dd358 Mon Sep 17 00:00:00 2001 From: Matt Spaulding Date: Sun, 3 Mar 2013 14:24:41 -0800 Subject: [PATCH 09/29] Fix classpath for scripts (#892690) --- xmlbeans-scripts-classpath.patch | 145 +++++++++++++++++++++++++++++++ xmlbeans.spec | 7 +- 2 files changed, 151 insertions(+), 1 deletion(-) create mode 100644 xmlbeans-scripts-classpath.patch diff --git a/xmlbeans-scripts-classpath.patch b/xmlbeans-scripts-classpath.patch new file mode 100644 index 0000000..24af1af --- /dev/null +++ b/xmlbeans-scripts-classpath.patch @@ -0,0 +1,145 @@ +Index: xmlbeans-2.6.0/bin/dumpxsb +=================================================================== +--- xmlbeans-2.6.0.orig/bin/dumpxsb ++++ xmlbeans-2.6.0/bin/dumpxsb +@@ -18,9 +18,7 @@ + #XSB file dumper + #Prints the contents of an xsb file in human-readmble form + +-echo `dirname $0` +- +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar + +Index: xmlbeans-2.6.0/bin/inst2xsd +=================================================================== +--- xmlbeans-2.6.0.orig/bin/inst2xsd ++++ xmlbeans-2.6.0/bin/inst2xsd +@@ -18,7 +18,7 @@ + #Instance to Schema tool + #Builds xsd files from xml instance files. + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar + +Index: xmlbeans-2.6.0/bin/scomp +=================================================================== +--- xmlbeans-2.6.0.orig/bin/scomp ++++ xmlbeans-2.6.0/bin/scomp +@@ -18,7 +18,7 @@ + #Schema compiler + #Builds XBean types from xsd files. + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$JAVA_HOME/lib/tools.jar:$XMLBEANS_LIB/resolver.jar + +Index: xmlbeans-2.6.0/bin/sdownload +=================================================================== +--- xmlbeans-2.6.0.orig/bin/sdownload ++++ xmlbeans-2.6.0/bin/sdownload +@@ -18,7 +18,7 @@ + #Schema downloader + #Tool to download Schema files + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar + +Index: xmlbeans-2.6.0/bin/sfactor +=================================================================== +--- xmlbeans-2.6.0.orig/bin/sfactor ++++ xmlbeans-2.6.0/bin/sfactor +@@ -20,7 +20,7 @@ + ## Factors redundant definitions out of a set of schemas and + ## uses imports instead. + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar + +Index: xmlbeans-2.6.0/bin/svalidate +=================================================================== +--- xmlbeans-2.6.0.orig/bin/svalidate ++++ xmlbeans-2.6.0/bin/svalidate +@@ -19,7 +19,7 @@ + # + # Validates an instance against a schema. + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/jsr173_1.0_ri.jar + +Index: xmlbeans-2.6.0/bin/validate +=================================================================== +--- xmlbeans-2.6.0.orig/bin/validate ++++ xmlbeans-2.6.0/bin/validate +@@ -19,7 +19,7 @@ + # + # Validates an instance against a schema. + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar + +Index: xmlbeans-2.6.0/bin/xpretty +=================================================================== +--- xmlbeans-2.6.0.orig/bin/xpretty ++++ xmlbeans-2.6.0/bin/xpretty +@@ -17,7 +17,7 @@ + + #Invokes pretty printer + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar + +Index: xmlbeans-2.6.0/bin/xsd2inst +=================================================================== +--- xmlbeans-2.6.0.orig/bin/xsd2inst ++++ xmlbeans-2.6.0/bin/xsd2inst +@@ -17,7 +17,7 @@ + + #Schema to instance tool + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar + +Index: xmlbeans-2.6.0/bin/xsdtree +=================================================================== +--- xmlbeans-2.6.0.orig/bin/xsdtree ++++ xmlbeans-2.6.0/bin/xsdtree +@@ -17,7 +17,7 @@ + + # Invokes type hierarchy printer + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar + +Index: xmlbeans-2.6.0/bin/xstc +=================================================================== +--- xmlbeans-2.6.0.orig/bin/xstc ++++ xmlbeans-2.6.0/bin/xstc +@@ -17,7 +17,7 @@ + + # Invokes XSTC + +-if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi ++XMLBEANS_LIB=/usr/share/java/xmlbeans + + cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar + diff --git a/xmlbeans.spec b/xmlbeans.spec index 2916651..23df94a 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -32,7 +32,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 1%{?dist}%{?with_bootstrap:.boot} +Release: 2%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool Group: Development/Libraries URL: http://xmlbeans.apache.org/ @@ -46,6 +46,7 @@ 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 +Patch4: xmlbeans-scripts-classpath.patch License: ASL 2.0 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -116,6 +117,7 @@ Requires: %{name} = %{version}-%{release} %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build @@ -216,6 +218,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Mar 03 2013 Matt Spaulding - 2.6.0-2 +- Fixed classpath issue with scripts (#892690) + * Sat Oct 13 2012 Matt Spaulding - 2.6.0-1 - Updated to latest version 2.6.0 (#824022) - Compiles with target 1.5 (#842625) From a6dda4f9f280fb9802023521d723d4467a3210d8 Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Wed, 12 Jun 2013 17:23:50 +0200 Subject: [PATCH 10/29] Update to latest packaging guidelines --- xmlbeans.spec | 42 ++++++++++-------------------------------- 1 file changed, 10 insertions(+), 32 deletions(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index f3a7987..9d436dd 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -32,9 +32,8 @@ Name: xmlbeans Version: 2.6.0 -Release: 3%{?dist}%{?with_bootstrap:.boot} +Release: 4%{?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 # Pom file is not available from maven repository for the @@ -48,7 +47,6 @@ Patch2: xmlbeans-2.6.0-iso-8859-1-encoding.patch Patch3: xmlbeans-2.6.0-jsr-bundle.patch Patch4: xmlbeans-scripts-classpath.patch License: ASL 2.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %if %without bootstrap BuildRequires: xmlbeans @@ -56,7 +54,6 @@ BuildRequires: xmlbeans 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 @@ -86,9 +83,6 @@ Object model. %package javadoc Summary: Javadoc for %{name} -Group: Documentation -Requires: %{name} = %{version}-%{release} -Requires: jpackage-utils %description javadoc %{summary}. @@ -96,7 +90,6 @@ Requires: jpackage-utils %package manual Summary: Documents for %{name} -Group: Documentation %description manual %{summary}. @@ -104,7 +97,6 @@ Group: Documentation %package scripts Summary: Scripts for %{name} -Group: Development/Tools Requires: %{name} = %{version}-%{release} %description scripts @@ -143,16 +135,11 @@ sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbe ant -Djavac.source=1.5 -Djavac.target=1.5 default docs %install -rm -rf $RPM_BUILD_ROOT - # jar install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name} -install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic-%{version}.jar -install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath-%{version}.jar -install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean-%{version}.jar -ln -s xmlpublic-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar -ln -s xbean_xpath-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar -ln -s xbean-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar +install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar +install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar +install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-xbean.pom @@ -190,34 +177,25 @@ cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r > mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%{_javadir}/* -%{_mavenpomdir}/JPP.%{name}-*.pom -%{_mavendepmapfragdir}/%{name} +%files -f .mfiles %doc LICENSE.txt NOTICE.txt README.txt - %files javadoc -%defattr(0644,root,root,0755) +%doc LICENSE.txt NOTICE.txt README.txt %doc %{_javadocdir}/%{name} - %files manual -%defattr(0644,root,root,0755) +%doc LICENSE.txt NOTICE.txt README.txt %{_docdir}/%{name}-%{version} - %files scripts -%defattr(0644,root,root,0755) %attr(0755,root,root) %{_bindir}/* %changelog +* Wed Jun 12 2013 Stanislav Ochotnicky - 2.6.0-4 +- Update to latest packaging guidelines + * Sun Mar 03 2013 Matt Spaulding - 2.6.0-3 - Fixed classpath issue with scripts (#892690) From 95db67c837a6bdb17f30de5dacd449d51cc52a22 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:29:07 -0500 Subject: [PATCH 11/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 9d436dd..b968ff5 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -32,7 +32,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 4%{?dist}%{?with_bootstrap:.boot} +Release: 5%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -193,6 +193,9 @@ mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 2.6.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Jun 12 2013 Stanislav Ochotnicky - 2.6.0-4 - Update to latest packaging guidelines From 9f061b3da84706e34837f5bb459a648f796e7bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 12 Aug 2013 11:48:41 +0300 Subject: [PATCH 12/29] Install docs to %{_pkgdocdir} where available (#993883). --- xmlbeans.spec | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index b968ff5..aabccf5 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -29,10 +29,11 @@ # %bcond_with bootstrap +%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} Name: xmlbeans Version: 2.6.0 -Release: 5%{?dist}%{?with_bootstrap:.boot} +Release: 6%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -129,7 +130,7 @@ ln -sf $(build-classpath saxon) external/lib/saxon9.jar ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar # Fix CRLF -sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css +sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css docs/guide/tools.html # Build ant -Djavac.source=1.5 -Djavac.target=1.5 default docs @@ -170,29 +171,33 @@ cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} rm -rf build/docs/reference # manual -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -cp -pr build/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -# fix line endings -cat $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html | tr -d \\r > tmp -mv tmp $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/guide/tools.html - +install -d -m 755 $RPM_BUILD_ROOT%{_pkgdocdir} +cp -pr build/docs/* LICENSE.txt NOTICE.txt README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %files -f .mfiles -%doc LICENSE.txt NOTICE.txt README.txt +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/LICENSE.txt +%doc %{_pkgdocdir}/NOTICE.txt +%doc %{_pkgdocdir}/README.txt %files javadoc -%doc LICENSE.txt NOTICE.txt README.txt +%dir %{_pkgdocdir} +%doc %{_pkgdocdir}/LICENSE.txt +%doc %{_pkgdocdir}/NOTICE.txt +%doc %{_pkgdocdir}/README.txt %doc %{_javadocdir}/%{name} %files manual -%doc LICENSE.txt NOTICE.txt README.txt -%{_docdir}/%{name}-%{version} +%{_pkgdocdir} %files scripts %attr(0755,root,root) %{_bindir}/* %changelog +* Mon Aug 12 2013 Ville Skyttä - 2.6.0-6 +- Install docs to %%{_pkgdocdir} where available (#993883). + * Sun Aug 04 2013 Fedora Release Engineering - 2.6.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From cc9fd2585a96c9ad0b3b308f3e1f7e1e91cb8afc Mon Sep 17 00:00:00 2001 From: Stanislav Ochotnicky Date: Tue, 4 Mar 2014 09:05:10 +0100 Subject: [PATCH 13/29] Use Requires: java-headless rebuild (#1067528) --- xmlbeans.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index aabccf5..255201d 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 6%{?dist}%{?with_bootstrap:.boot} +Release: 7%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -59,7 +59,7 @@ BuildRequires: xml-commons-resolver >= 0:1.1 BuildRequires: bea-stax-api BuildRequires: saxon >= 8 Requires: jpackage-utils >= 0:1.6 -Requires: java +Requires: java-headless BuildArch: noarch @@ -195,6 +195,9 @@ cp -pr build/docs/* LICENSE.txt NOTICE.txt README.txt $RPM_BUILD_ROOT%{_pkgdocdi %changelog +* Tue Mar 04 2014 Stanislav Ochotnicky - 2.6.0-7 +- Use Requires: java-headless rebuild (#1067528) + * Mon Aug 12 2013 Ville Skyttä - 2.6.0-6 - Install docs to %%{_pkgdocdir} where available (#993883). From 8c958ffae7af5ebd598adf9e64fa0b93373f1a39 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 8 Jun 2014 01:05:19 -0500 Subject: [PATCH 14/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 255201d..9d2621b 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 7%{?dist}%{?with_bootstrap:.boot} +Release: 8%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -195,6 +195,9 @@ cp -pr build/docs/* LICENSE.txt NOTICE.txt README.txt $RPM_BUILD_ROOT%{_pkgdocdi %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 2.6.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Mar 04 2014 Stanislav Ochotnicky - 2.6.0-7 - Use Requires: java-headless rebuild (#1067528) From 281cb507b3960c3c231cbb326e8266828af5df1b Mon Sep 17 00:00:00 2001 From: gil Date: Fri, 13 Feb 2015 19:07:27 +0100 Subject: [PATCH 15/29] introduce license macro --- xmlbeans.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 9d2621b..c99158e 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 8%{?dist}%{?with_bootstrap:.boot} +Release: 9%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -176,16 +176,14 @@ cp -pr build/docs/* LICENSE.txt NOTICE.txt README.txt $RPM_BUILD_ROOT%{_pkgdocdi %files -f .mfiles %dir %{_pkgdocdir} -%doc %{_pkgdocdir}/LICENSE.txt -%doc %{_pkgdocdir}/NOTICE.txt %doc %{_pkgdocdir}/README.txt +%license LICENSE.txt NOTICE.txt %files javadoc %dir %{_pkgdocdir} -%doc %{_pkgdocdir}/LICENSE.txt -%doc %{_pkgdocdir}/NOTICE.txt %doc %{_pkgdocdir}/README.txt %doc %{_javadocdir}/%{name} +%license LICENSE.txt NOTICE.txt %files manual %{_pkgdocdir} @@ -195,6 +193,9 @@ cp -pr build/docs/* LICENSE.txt NOTICE.txt README.txt $RPM_BUILD_ROOT%{_pkgdocdi %changelog +* Fri Feb 13 2015 gil cattaneo 2.6.0-9 +- introduce license macro + * Sun Jun 08 2014 Fedora Release Engineering - 2.6.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 75d2a0d6bbdcd930e823927ece83af64fa764ec5 Mon Sep 17 00:00:00 2001 From: gil Date: Sun, 15 Feb 2015 02:25:26 +0100 Subject: [PATCH 16/29] introduce license macro --- xmlbeans.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index c99158e..926483c 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -172,7 +172,7 @@ rm -rf build/docs/reference # manual install -d -m 755 $RPM_BUILD_ROOT%{_pkgdocdir} -cp -pr build/docs/* LICENSE.txt NOTICE.txt README.txt $RPM_BUILD_ROOT%{_pkgdocdir} +cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %files -f .mfiles %dir %{_pkgdocdir} From 519fabab2b0a96b86a503ecaef816b9d6df2b850 Mon Sep 17 00:00:00 2001 From: gil Date: Sun, 15 Feb 2015 03:24:59 +0100 Subject: [PATCH 17/29] build fix for Java8 --- xmlbeans-2.6.0-java8.patch | 10 ++++++++++ xmlbeans.spec | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 xmlbeans-2.6.0-java8.patch diff --git a/xmlbeans-2.6.0-java8.patch b/xmlbeans-2.6.0-java8.patch new file mode 100644 index 0000000..6772397 --- /dev/null +++ b/xmlbeans-2.6.0-java8.patch @@ -0,0 +1,10 @@ +--- build.xml 2015-02-15 03:12:23.105593326 +0100 ++++ build.xml.java8 2015-02-15 03:16:59.857032487 +0100 +@@ -694,6 +694,7 @@ + + + ++ + + + diff --git a/xmlbeans.spec b/xmlbeans.spec index 926483c..bcf99cf 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -47,6 +47,9 @@ 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 Patch4: xmlbeans-scripts-classpath.patch +# error: cannot access TypeStoreUser +Patch5: xmlbeans-2.6.0-java8.patch + License: ASL 2.0 %if %without bootstrap @@ -111,7 +114,7 @@ Requires: %{name} = %{version}-%{release} %patch2 -p1 %patch3 -p1 %patch4 -p1 - +%patch5 -p0 %build # Piccolo and jam are rebuilt from source and bundled with xbean @@ -133,7 +136,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 docs/guide/tools.html # Build -ant -Djavac.source=1.5 -Djavac.target=1.5 default docs +ant -Djavac.source=1.6 -Djavac.target=1.6 default docs %install # jar From 7b2f86f13201ff140611a91fea57d0a3f6bc0a5a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 04:08:17 +0000 Subject: [PATCH 18/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index bcf99cf..e4d4965 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 9%{?dist}%{?with_bootstrap:.boot} +Release: 10%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -196,6 +196,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 2.6.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Feb 13 2015 gil cattaneo 2.6.0-9 - introduce license macro From 3de110df854c199415d8180dd9265e65f3aa7422 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 03:35:37 +0000 Subject: [PATCH 19/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index e4d4965..3521b32 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 10%{?dist}%{?with_bootstrap:.boot} +Release: 11%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -196,6 +196,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 2.6.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Jun 19 2015 Fedora Release Engineering - 2.6.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 108838f362481cb1b53067ccf579c13e3cfdffd0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 3 Jun 2016 14:25:57 +0200 Subject: [PATCH 20/29] fix build-classpath against current saxon --- xmlbeans.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 3521b32..d102534 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 11%{?dist}%{?with_bootstrap:.boot} +Release: 12%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -129,8 +129,8 @@ mkdir -p build/lib ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar -ln -sf $(build-classpath saxon) external/lib/saxon9.jar -ln -sf $(build-classpath saxon) external/lib/saxon9-dom.jar +ln -sf $(build-classpath saxon/saxon) external/lib/saxon9.jar +ln -sf $(build-classpath saxon/saxon) external/lib/saxon9-dom.jar # Fix CRLF sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css docs/guide/tools.html @@ -196,6 +196,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Fri Jun 03 2016 daviddavid - 2.6.0-12 +- fix build-classpath against current saxon + * Fri Feb 05 2016 Fedora Release Engineering - 2.6.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a7b48bc193554ebf216504ac414ca1231d89d38b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 17:57:01 +0000 Subject: [PATCH 21/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index d102534..6b89017 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 12%{?dist}%{?with_bootstrap:.boot} +Release: 13%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -196,6 +196,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.6.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jun 03 2016 daviddavid - 2.6.0-12 - fix build-classpath against current saxon From ffa218e847b9ace4a091858672f44a25980d47fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 22:12:59 +0000 Subject: [PATCH 22/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 6b89017..47c2082 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 13%{?dist}%{?with_bootstrap:.boot} +Release: 14%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -196,6 +196,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 2.6.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 2.6.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 147b1acd7c126346b16be36a1afa1fdabb025e6e Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Mon, 8 Jan 2018 15:52:14 -0600 Subject: [PATCH 23/29] As of F27, add_maven_depmap macro is now located in javapackages-local. Added BuildRequires javapackages-local to provide needed POM editor macro. --- xmlbeans.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 47c2082..7c4914d 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 14%{?dist}%{?with_bootstrap:.boot} +Release: 15%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -57,6 +57,10 @@ BuildRequires: xmlbeans %endif BuildRequires: java-devel BuildRequires: jpackage-utils >= 0:1.5 +%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 +# add_maven_depmap macro is now located in javapackages-local +BuildRequires: javapackages-local +%endif BuildRequires: ant >= 0:1.6, ant-junit, ant-contrib, junit BuildRequires: xml-commons-resolver >= 0:1.1 BuildRequires: bea-stax-api @@ -196,6 +200,10 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Mon Jan 08 2018 Merlin Mathesius - 2.6.0-15 +- As of F27, add_maven_depmap macro is now located in javapackages-local. + Added BuildRequires javapackages-local to provide needed POM editor macro. + * Thu Jul 27 2017 Fedora Release Engineering - 2.6.0-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 1543413f62734fe88d7ce74136e907cd1279c903 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 9 Jan 2018 07:37:02 -0600 Subject: [PATCH 24/29] Remove unnecessary conditional --- xmlbeans.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 7c4914d..a7729d1 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -57,10 +57,8 @@ BuildRequires: xmlbeans %endif BuildRequires: java-devel BuildRequires: jpackage-utils >= 0:1.5 -%if 0%{?fedora} >= 27 || 0%{?rhel} > 7 # add_maven_depmap macro is now located in javapackages-local BuildRequires: javapackages-local -%endif BuildRequires: ant >= 0:1.6, ant-junit, ant-contrib, junit BuildRequires: xml-commons-resolver >= 0:1.1 BuildRequires: bea-stax-api From eec316627fa4d22180d55f4539bf6a9b7ffe2ae8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 21:46:22 +0000 Subject: [PATCH 25/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index a7729d1..fb07bd4 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 15%{?dist}%{?with_bootstrap:.boot} +Release: 16%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -198,6 +198,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 2.6.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Mon Jan 08 2018 Merlin Mathesius - 2.6.0-15 - As of F27, add_maven_depmap macro is now located in javapackages-local. Added BuildRequires javapackages-local to provide needed POM editor macro. From 761063515cb68d55f25bbe8e07f6489604a02e62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 09:23:05 +0000 Subject: [PATCH 26/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index fb07bd4..646415e 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 16%{?dist}%{?with_bootstrap:.boot} +Release: 17%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -198,6 +198,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 2.6.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 2.6.0-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From d4d2461952e411d54e972d12088c25ed77ee3cff Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 12:32:29 +0000 Subject: [PATCH 27/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index 646415e..ad1b3fa 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 17%{?dist}%{?with_bootstrap:.boot} +Release: 18%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -198,6 +198,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 2.6.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Sat Jul 14 2018 Fedora Release Engineering - 2.6.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From b8d984f3a39f0699bd72eab7faf4ba62afb4be55 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:20:08 +0000 Subject: [PATCH 28/29] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmlbeans.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmlbeans.spec b/xmlbeans.spec index ad1b3fa..b4ecf99 100644 --- a/xmlbeans.spec +++ b/xmlbeans.spec @@ -33,7 +33,7 @@ Name: xmlbeans Version: 2.6.0 -Release: 18%{?dist}%{?with_bootstrap:.boot} +Release: 19%{?dist}%{?with_bootstrap:.boot} Summary: XML-Java binding tool URL: http://xmlbeans.apache.org/ Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz @@ -198,6 +198,9 @@ cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 2.6.0-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 2.6.0-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From d6f53115f5c031bc0f83cadb28db3aee39576d0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Wed, 11 Sep 2019 12:54:59 +0200 Subject: [PATCH 29/29] Orphaned for 6+ weeks --- .gitignore | 2 - 0001-Update-to-newer-saxon-API.patch | 25 -- dead.package | 1 + sources | 1 - xmlbeans-2.6.0-iso-8859-1-encoding.patch | 177 ------------- xmlbeans-2.6.0-java8.patch | 10 - xmlbeans-2.6.0-jsr-bundle.patch | 18 -- xmlbeans-2.6.0-nodownload.patch | 46 ---- xmlbeans-2.6.0.pom | 147 ----------- xmlbeans-scripts-classpath.patch | 145 ----------- xmlbeans-xmlpublic-2.6.0.pom | 99 -------- xmlbeans-xpath-2.6.0.pom | 104 -------- xmlbeans.spec | 308 ----------------------- 13 files changed, 1 insertion(+), 1082 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Update-to-newer-saxon-API.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xmlbeans-2.6.0-iso-8859-1-encoding.patch delete mode 100644 xmlbeans-2.6.0-java8.patch delete mode 100644 xmlbeans-2.6.0-jsr-bundle.patch delete mode 100644 xmlbeans-2.6.0-nodownload.patch delete mode 100644 xmlbeans-2.6.0.pom delete mode 100644 xmlbeans-scripts-classpath.patch delete mode 100644 xmlbeans-xmlpublic-2.6.0.pom delete mode 100644 xmlbeans-xpath-2.6.0.pom delete mode 100644 xmlbeans.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index bd08e0e..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -xmlbeans-2.4.0-src.tgz -/xmlbeans-2.6.0-src.tgz diff --git a/0001-Update-to-newer-saxon-API.patch b/0001-Update-to-newer-saxon-API.patch deleted file mode 100644 index ad79a95..0000000 --- a/0001-Update-to-newer-saxon-API.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c06b729673544826892266c5778227a47c495d49 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Wed, 23 May 2012 11:54:56 +0200 -Subject: [PATCH] Update to newer saxon API - ---- - .../xmlbeans/impl/xpath/saxon/XBeansXPath.java | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java b/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java -index f210e95..b972c85 100644 ---- a/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java -+++ b/src/xpath_xquery/org/apache/xmlbeans/impl/xpath/saxon/XBeansXPath.java -@@ -27,7 +27,7 @@ import org.w3c.dom.Node; - import net.sf.saxon.Configuration; - import net.sf.saxon.dom.NodeWrapper; - import net.sf.saxon.om.NodeInfo; --import net.sf.saxon.om.VirtualNode; -+import net.sf.saxon.tree.wrapper.VirtualNode; - import net.sf.saxon.om.Item; - import net.sf.saxon.value.Value; - import net.sf.saxon.sxpath.XPathEvaluator; --- -1.7.7.6 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/sources b/sources deleted file mode 100644 index c179a77..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 5cbdc0e..0000000 --- a/xmlbeans-2.6.0-iso-8859-1-encoding.patch +++ /dev/null @@ -1,177 +0,0 @@ -Index: xmlbeans-2.6.0/build.xml -=================================================================== ---- xmlbeans-2.6.0.orig/build.xml -+++ xmlbeans-2.6.0/build.xml -@@ -18,6 +18,7 @@ - - - -+ - - - -@@ -292,6 +293,7 @@ - - - -@@ -536,6 +538,7 @@ - - - -@@ -547,7 +550,7 @@ - - - -- -+ - - - -@@ -584,7 +587,7 @@ - - - -- -+ - - - -@@ -599,7 +602,7 @@ - - - -- -+ - - - -@@ -624,7 +627,7 @@ - - - -- -+ - - - -@@ -641,7 +644,7 @@ - repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes, - configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes"> - -- -+ - - - -@@ -679,7 +682,7 @@ - - - -- -+ - - - -@@ -699,7 +702,7 @@ - - - -- -+ - - - -@@ -716,7 +719,7 @@ - - - -- -+ - - - -@@ -727,7 +730,7 @@ - - - -- -+ - - - -@@ -740,7 +743,7 @@ - - -- -+ - - - -@@ -759,7 +762,7 @@ - depends="dirs, common.classes, xmlpublic.classes, typestore.classes, saaj_api.classes, piccolo.classes, - typeimpl.classes, xmlcomp.classes"> - -- -+ - - - -@@ -847,7 +850,7 @@ - - - -- -+ - - - -@@ -972,7 +975,7 @@ - - - -- -+ - - - -@@ -991,6 +994,7 @@ - destdir="build/classes/xpath_xquery" - classpathref="xpath.compile.path" - source="${javac.source}" target="${javac.target}" -+ encoding="${javac.encoding}" - debug="on"> - - -@@ -1079,6 +1083,7 @@ - destdir="build/private/classes/drt" - classpathref="test.compile.path" - source="${javac.source}" target="${javac.target}" -+ encoding="${javac.encoding}" - debug="on"> - - -@@ -1138,6 +1143,7 @@ - - - -@@ -1174,6 +1180,7 @@ - destdir="build/classes/piccolo" - classpath="" - source="1.3" target="1.4" -+ encoding="${javac.encoding}" - debug="on"> - - diff --git a/xmlbeans-2.6.0-java8.patch b/xmlbeans-2.6.0-java8.patch deleted file mode 100644 index 6772397..0000000 --- a/xmlbeans-2.6.0-java8.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- build.xml 2015-02-15 03:12:23.105593326 +0100 -+++ build.xml.java8 2015-02-15 03:16:59.857032487 +0100 -@@ -694,6 +694,7 @@ - - - -+ - - - diff --git a/xmlbeans-2.6.0-jsr-bundle.patch b/xmlbeans-2.6.0-jsr-bundle.patch deleted file mode 100644 index d75d571..0000000 --- a/xmlbeans-2.6.0-jsr-bundle.patch +++ /dev/null @@ -1,18 +0,0 @@ -Index: xmlbeans-2.6.0/build.xml -=================================================================== ---- xmlbeans-2.6.0.orig/build.xml -+++ xmlbeans-2.6.0/build.xml -@@ -152,11 +152,11 @@ - -- -+ - - - diff --git a/xmlbeans-2.6.0-nodownload.patch b/xmlbeans-2.6.0-nodownload.patch deleted file mode 100644 index c828fe4..0000000 --- a/xmlbeans-2.6.0-nodownload.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 - --> -- - -@@ -121,7 +121,7 @@ - - - -- -+ - - - -@@ -137,9 +137,9 @@ - -- -+ verbose="true" usetimestamp="true" ignoreerrors="true"/ --> - - - -@@ -169,9 +169,9 @@ - - - -- -+ verbose="true" usetimestamp="true" ignoreerrors="true"/ --> - - - diff --git a/xmlbeans-2.6.0.pom b/xmlbeans-2.6.0.pom deleted file mode 100644 index 9773fe6..0000000 --- a/xmlbeans-2.6.0.pom +++ /dev/null @@ -1,147 +0,0 @@ - - 4.0.0 - org.apache.xmlbeans - xmlbeans - 2.6.0 - - XmlBeans - XmlBeans main jar - http://xmlbeans.apache.org - - - jira - http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10436 - - - - - XmlBeans User List - user-subscribe@xmlbeans.apache.org - users-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-user/ - - - XmlBeans Developer List - dev-subscribe@xmlbeans.apache.org - dev-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-dev/ - - - Source Control List - commits-subscribe@xmlbeans.apache.org - commits-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-commits/ - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - scm:svn:https://svn.apache.org/repos/asf/xmlbeans/ - scm:svn:https://${maven.username}@svn.apache.org/repos/asf/xmlbeans/ - https://svn.apache.org/repos/asf/xmlbeans/ - - - - XmlBeans - http://xmlbeans.apache.org/ - - - - - Cezar Andrei - cezar - cezar.andrei@no#spam#!bea.com - - - - - David Bau - dbau - david.bau@no#spam.google.com - - - - Patrick Calahan - - pcal@no#spam.bea.com - - - - Yana Kadiyska - - ykadiysk@no#spam#!bea.com - - - - Ken Kress - - ken@nos#pam.kress.org - - - - Kevin Krouse - - kkrouse@n#osp#am.apache.org - - - - Laurence Moroney - - laurence.moroney@nospa#m.reuters.com - - - - Radu Preotiuc - radup - radu.preotiuc-pietro@nos#pam.bea.com - - - - Cliff Schmidt - - cliffschmidt@n#osp#am!gmail.com - - - - Dutta Satadip - - s-dutta@no#spam.sbcglobal.net - - - - Eric Vasilik - - eric@nos#pam.vasilik.com - - - - David Waite - - dwaite@no#spam.apache.org - - - - Scott Ziegler - - scott.ziegler@n#ospam.bea.com - - - - - - - - stax - stax-api - 1.0.1 - - - - diff --git a/xmlbeans-scripts-classpath.patch b/xmlbeans-scripts-classpath.patch deleted file mode 100644 index 24af1af..0000000 --- a/xmlbeans-scripts-classpath.patch +++ /dev/null @@ -1,145 +0,0 @@ -Index: xmlbeans-2.6.0/bin/dumpxsb -=================================================================== ---- xmlbeans-2.6.0.orig/bin/dumpxsb -+++ xmlbeans-2.6.0/bin/dumpxsb -@@ -18,9 +18,7 @@ - #XSB file dumper - #Prints the contents of an xsb file in human-readmble form - --echo `dirname $0` -- --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar - -Index: xmlbeans-2.6.0/bin/inst2xsd -=================================================================== ---- xmlbeans-2.6.0.orig/bin/inst2xsd -+++ xmlbeans-2.6.0/bin/inst2xsd -@@ -18,7 +18,7 @@ - #Instance to Schema tool - #Builds xsd files from xml instance files. - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar - -Index: xmlbeans-2.6.0/bin/scomp -=================================================================== ---- xmlbeans-2.6.0.orig/bin/scomp -+++ xmlbeans-2.6.0/bin/scomp -@@ -18,7 +18,7 @@ - #Schema compiler - #Builds XBean types from xsd files. - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$JAVA_HOME/lib/tools.jar:$XMLBEANS_LIB/resolver.jar - -Index: xmlbeans-2.6.0/bin/sdownload -=================================================================== ---- xmlbeans-2.6.0.orig/bin/sdownload -+++ xmlbeans-2.6.0/bin/sdownload -@@ -18,7 +18,7 @@ - #Schema downloader - #Tool to download Schema files - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar - -Index: xmlbeans-2.6.0/bin/sfactor -=================================================================== ---- xmlbeans-2.6.0.orig/bin/sfactor -+++ xmlbeans-2.6.0/bin/sfactor -@@ -20,7 +20,7 @@ - ## Factors redundant definitions out of a set of schemas and - ## uses imports instead. - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar - -Index: xmlbeans-2.6.0/bin/svalidate -=================================================================== ---- xmlbeans-2.6.0.orig/bin/svalidate -+++ xmlbeans-2.6.0/bin/svalidate -@@ -19,7 +19,7 @@ - # - # Validates an instance against a schema. - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/jsr173_1.0_ri.jar - -Index: xmlbeans-2.6.0/bin/validate -=================================================================== ---- xmlbeans-2.6.0.orig/bin/validate -+++ xmlbeans-2.6.0/bin/validate -@@ -19,7 +19,7 @@ - # - # Validates an instance against a schema. - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar - -Index: xmlbeans-2.6.0/bin/xpretty -=================================================================== ---- xmlbeans-2.6.0.orig/bin/xpretty -+++ xmlbeans-2.6.0/bin/xpretty -@@ -17,7 +17,7 @@ - - #Invokes pretty printer - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar - -Index: xmlbeans-2.6.0/bin/xsd2inst -=================================================================== ---- xmlbeans-2.6.0.orig/bin/xsd2inst -+++ xmlbeans-2.6.0/bin/xsd2inst -@@ -17,7 +17,7 @@ - - #Schema to instance tool - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar - -Index: xmlbeans-2.6.0/bin/xsdtree -=================================================================== ---- xmlbeans-2.6.0.orig/bin/xsdtree -+++ xmlbeans-2.6.0/bin/xsdtree -@@ -17,7 +17,7 @@ - - # Invokes type hierarchy printer - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar - -Index: xmlbeans-2.6.0/bin/xstc -=================================================================== ---- xmlbeans-2.6.0.orig/bin/xstc -+++ xmlbeans-2.6.0/bin/xstc -@@ -17,7 +17,7 @@ - - # Invokes XSTC - --if [ -z "$XMLBEANS_LIB" ]; then . `dirname $0`/_setlib; fi -+XMLBEANS_LIB=/usr/share/java/xmlbeans - - cp=$XMLBEANS_LIB/xbean.jar:$XMLBEANS_LIB/xmlbeans-qname.jar:$XMLBEANS_LIB/jsr173_1.0_api.jar:$XMLBEANS_LIB/resolver.jar - diff --git a/xmlbeans-xmlpublic-2.6.0.pom b/xmlbeans-xmlpublic-2.6.0.pom deleted file mode 100644 index c1958b2..0000000 --- a/xmlbeans-xmlpublic-2.6.0.pom +++ /dev/null @@ -1,99 +0,0 @@ - - 4.0.0 - org.apache.xmlbeans - xmlbeans-xmlpublic - 2.6.0 - - XmlPublic - XmlBeans Public interfaces - http://xmlbeans.apache.org - - - jira - http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10436 - - - - - XmlBeans User List - user-subscribe@xmlbeans.apache.org - users-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-user/ - - - XmlBeans Developer List - dev-subscribe@xmlbeans.apache.org - dev-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-dev/ - - - Source Control List - commits-subscribe@xmlbeans.apache.org - commits-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-commits/ - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - scm:svn:https://svn.apache.org/repos/asf/xmlbeans/ - scm:svn:https://${maven.username}@svn.apache.org/repos/asf/xmlbeans/ - https://svn.apache.org/repos/asf/xmlbeans/ - - - - XmlBeans - http://xmlbeans.apache.org/ - - - - - Cezar Andrei - cezar - cezar.andrei@no#spam#!gma|l.com - - - - - Radu Preotiuc - radup - radupr@nos#pam.gm@il.com - - - - Radu Preotiuc - radup - radu.preotiuc-pietro@nos#pam.bea.com - - - - Wing Yew Poon - wpoon - wing-yew.poon@nos#pam.oracle.com - - - - Jacob Danner - jdanner - jacob.danner@nos#pam.oracle.com - - - - - - - - stax - stax-api - 1.0.1 - - - - diff --git a/xmlbeans-xpath-2.6.0.pom b/xmlbeans-xpath-2.6.0.pom deleted file mode 100644 index 7bfec71..0000000 --- a/xmlbeans-xpath-2.6.0.pom +++ /dev/null @@ -1,104 +0,0 @@ - - 4.0.0 - org.apache.xmlbeans - xmlbeans-xpath - 2.6.0 - - XmlBeansXPath - XmlBeans extended XPath and XQuery support - http://xmlbeans.apache.org - - - jira - http://issues.apache.org/jira/secure/BrowseProject.jspa?id=10436 - - - - - XmlBeans User List - user-subscribe@xmlbeans.apache.org - users-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-user/ - - - XmlBeans Developer List - dev-subscribe@xmlbeans.apache.org - dev-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-dev/ - - - Source Control List - commits-subscribe@xmlbeans.apache.org - commits-unsubscribe@xmlbeans.apache.org - http://mail-archives.apache.org/mod_mbox/xmlbeans-commits/ - - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - scm:svn:https://svn.apache.org/repos/asf/xmlbeans/ - scm:svn:https://${maven.username}@svn.apache.org/repos/asf/xmlbeans/ - https://svn.apache.org/repos/asf/xmlbeans/ - - - - XmlBeans - http://xmlbeans.apache.org/ - - - - - Cezar Andrei - cezar - cezar.andrei@no#spam#!gma|l.com - - - - - Radu Preotiuc - radup - radupr@nos#pam.gm@il.com - - - - Radu Preotiuc - radup - radu.preotiuc-pietro@nos#pam.bea.com - - - - Wing Yew Poon - wpoon - wing-yew.poon@nos#pam.oracle.com - - - - Jacob Danner - jdanner - jacob.danner@nos#pam.oracle.com - - - - - - - - org.apache.xmlbeans - xmlbeans - 2.4.0 - - - net.sf.saxon - saxon - 9 - - - - diff --git a/xmlbeans.spec b/xmlbeans.spec deleted file mode 100644 index b4ecf99..0000000 --- a/xmlbeans.spec +++ /dev/null @@ -1,308 +0,0 @@ -# Copyright (c) 2000-2005, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -%bcond_with bootstrap -%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} - -Name: xmlbeans -Version: 2.6.0 -Release: 19%{?dist}%{?with_bootstrap:.boot} -Summary: XML-Java binding tool -URL: http://xmlbeans.apache.org/ -Source0: http://www.apache.org/dist/xmlbeans/source/%{name}-%{version}-src.tgz -# 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.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 -Patch4: xmlbeans-scripts-classpath.patch -# error: cannot access TypeStoreUser -Patch5: xmlbeans-2.6.0-java8.patch - -License: ASL 2.0 - -%if %without bootstrap -BuildRequires: xmlbeans -%endif -BuildRequires: java-devel -BuildRequires: jpackage-utils >= 0:1.5 -# add_maven_depmap macro is now located in javapackages-local -BuildRequires: javapackages-local -BuildRequires: ant >= 0:1.6, ant-junit, ant-contrib, junit -BuildRequires: xml-commons-resolver >= 0:1.1 -BuildRequires: bea-stax-api -BuildRequires: saxon >= 8 -Requires: jpackage-utils >= 0:1.6 -Requires: java-headless - -BuildArch: noarch - -%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 can take advantage the richness and -features of XML and XML Schema and have these features mapped -as naturally as possible to the equivalent Java language and -typing constructs. XMLBeans uses XML Schema to compile Java -interfaces and classes that you can then use to access and -modify XML instance data. Using XMLBeans is similar to using -any other Java interface/class, you will see things like -getFoo or setFoo just as you would expect when working with -Java. While a major use of XMLBeans is to access your XML -instance data with strongly typed Java classes there are also -API's that allow you access to the full XML infoset (XMLBeans -keeps full XML Infoset fidelity) as well as to allow you to -reflect into the XML schema itself through an XML Schema -Object model. - - -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -%{summary}. - - -%package manual -Summary: Documents for %{name} - -%description manual -%{summary}. - - -%package scripts -Summary: Scripts for %{name} -Requires: %{name} = %{version}-%{release} - -%description scripts -%{summary}. - - -%prep -%setup -q -n %{name}-%{version} -%patch0 -p1 -b .nodownload -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p0 - -%build -# Piccolo and jam are rebuilt from source and bundled with xbean -# ant clean.jars leaves some dangling jars around, do not use it -find . \( -name '*.jar' -o -name '*.zip' \) \ - -not -name 'piccolo*.jar' -not -name 'jam*.jar' \ - %{?with_bootstrap:-not -name 'oldxbean.jar' } \ - -print -delete - -# Replace bundled libraries -mkdir -p build/lib -ln -sf $(build-classpath xml-commons-resolver) build/lib/resolver.jar -ln -sf $(build-classpath xmlbeans/xbean) external/lib/oldxbean.jar -ln -sf $(build-classpath bea-stax-api) external/lib/jsr173_1.0_api.jar -ln -sf $(build-classpath saxon/saxon) external/lib/saxon9.jar -ln -sf $(build-classpath saxon/saxon) external/lib/saxon9-dom.jar - -# Fix CRLF -sed 's/\r//' -i LICENSE.txt NOTICE.txt README.txt docs/stylesheet.css docs/xmlbeans.css docs/guide/tools.html - -# Build -ant -Djavac.source=1.6 -Djavac.target=1.6 default docs - -%install -# jar -install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}/%{name} -install -p -m 0644 build/lib/xmlpublic.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlpublic.jar -install -p -m 0644 build/lib/xbean_xpath.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean_xpath.jar -install -p -m 0644 build/lib/xbean.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/xbean.jar - -mkdir -p $RPM_BUILD_ROOT%{_mavenpomdir} -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-xbean.pom -%add_maven_depmap JPP.%{name}-xbean.pom %{name}/xbean.jar -install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-xbean_xpath.pom -%add_maven_depmap JPP.%{name}-xbean_xpath.pom %{name}/xbean_xpath.jar -install -pm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-xmlpublic.pom -%add_maven_depmap JPP.%{name}-xmlpublic.pom %{name}/xmlpublic.jar - -# bin -install -d -m 0755 $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/dumpxsb $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/inst2xsd $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/scomp $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/sdownload $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/sfactor $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/svalidate $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/validate $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/xpretty $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/xsd2inst $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/xsdtree $RPM_BUILD_ROOT%{_bindir} -install -p -m 0755 bin/xstc $RPM_BUILD_ROOT%{_bindir} - - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} -cp -pr build/docs/reference/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -rm -rf build/docs/reference - -# manual -install -d -m 755 $RPM_BUILD_ROOT%{_pkgdocdir} -cp -pr build/docs/* README.txt $RPM_BUILD_ROOT%{_pkgdocdir} - -%files -f .mfiles -%dir %{_pkgdocdir} -%doc %{_pkgdocdir}/README.txt -%license LICENSE.txt NOTICE.txt - -%files javadoc -%dir %{_pkgdocdir} -%doc %{_pkgdocdir}/README.txt -%doc %{_javadocdir}/%{name} -%license LICENSE.txt NOTICE.txt - -%files manual -%{_pkgdocdir} - -%files scripts -%attr(0755,root,root) %{_bindir}/* - - -%changelog -* Sat Jul 27 2019 Fedora Release Engineering - 2.6.0-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 03 2019 Fedora Release Engineering - 2.6.0-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.6.0-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 2.6.0-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 08 2018 Merlin Mathesius - 2.6.0-15 -- As of F27, add_maven_depmap macro is now located in javapackages-local. - Added BuildRequires javapackages-local to provide needed POM editor macro. - -* Thu Jul 27 2017 Fedora Release Engineering - 2.6.0-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.6.0-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jun 03 2016 daviddavid - 2.6.0-12 -- fix build-classpath against current saxon - -* Fri Feb 05 2016 Fedora Release Engineering - 2.6.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jun 19 2015 Fedora Release Engineering - 2.6.0-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Feb 13 2015 gil cattaneo 2.6.0-9 -- introduce license macro - -* Sun Jun 08 2014 Fedora Release Engineering - 2.6.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 2.6.0-7 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Aug 12 2013 Ville Skyttä - 2.6.0-6 -- Install docs to %%{_pkgdocdir} where available (#993883). - -* Sun Aug 04 2013 Fedora Release Engineering - 2.6.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Jun 12 2013 Stanislav Ochotnicky - 2.6.0-4 -- Update to latest packaging guidelines - -* Sun Mar 03 2013 Matt Spaulding - 2.6.0-3 -- Fixed classpath issue with scripts (#892690) - -* Fri Feb 15 2013 Fedora Release Engineering - 2.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Oct 13 2012 Matt Spaulding - 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 - 2.4.0-10 -- Add maven POMs, RHBZ#825844 - -* Wed May 23 2012 Mikolaj Izdebski - 2.4.0-9 -- Update to newer saxon API - -* Sat Jan 14 2012 Fedora Release Engineering - 2.4.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 2.4.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Dec 09 2009 Lubomir Rintel - 2.4.0-6 -- Rebuild without bootstrapping - -* Fri Nov 27 2009 Lubomir Rintel - 2.4.0-5 -- Fix up saxon dependency -- Drop epoch -- Drop gcj - -* Tue Nov 03 2009 Lubomir Rintel 0:2.4.0-4 -- Update to 2.4.0 -- Tidy up a bit for Fedora - -* Wed Sep 06 2006 Ralph Apel 0:2.1.0-3jpp -- BuildRequire saxon8 instead of saxonb8 -- (B)Require bea-stax-api instead of bea-stax -- Patch maven-plugin's project.xml for bea-stax-api instead of stax-bea-api -- Patch XbeanXQuery to saxon 8.7 -- Add gcj_support option -- Add post/postun Requires for javadoc - -* Wed Feb 01 2006 Ralph Apel 0:2.1.0-2jpp -- Install plugin to /usr/share/maven/repository/JPP/plugins - -* Mon Jan 30 2006 Ralph Apel 0:2.1.0-1jpp -- Upgrade to 2.1.0 -- Add -maven-plugin subpackage - -* Fri Jun 03 2005 Fernando Nasser 0:1.0.4-2jpp -- Add missing build requires for jaxen - -* Fri Jun 03 2005 Fernando Nasser 0:1.0.4-1jpp -- Upgrade to 1.0.4 - -* Thu Sep 30 2004 Ralph Apel 0:1.0.3-1jpp -- First JPackage build