[jing-trang] Apply upstream Saxon >= 9.3 patch (#716177).
Ville Skyttä
scop at fedoraproject.org
Fri Jun 24 09:12:26 UTC 2011
commit 2aef1aba33fb8fea09601106e84b22a83eb572ca
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Fri Jun 24 12:12:07 2011 +0300
Apply upstream Saxon >= 9.3 patch (#716177).
jing-trang-20091111-saxon93-716177.patch | 19 +++++++++++++++++++
jing-trang.spec | 10 ++++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/jing-trang-20091111-saxon93-716177.patch b/jing-trang-20091111-saxon93-716177.patch
new file mode 100644
index 0000000..c1c2dc2
--- /dev/null
+++ b/jing-trang-20091111-saxon93-716177.patch
@@ -0,0 +1,19 @@
+diff -up jing-trang-20091111/mod/schematron/src/main/com/thaiopensource/validate/schematron/NewSaxonSchemaReaderFactory.java~ jing-trang-20091111/mod/schematron/src/main/com/thaiopensource/validate/schematron/NewSaxonSchemaReaderFactory.java
+--- jing-trang-20091111/mod/schematron/src/main/com/thaiopensource/validate/schematron/NewSaxonSchemaReaderFactory.java~ 2008-11-07 04:49:44.000000000 +0200
++++ jing-trang-20091111/mod/schematron/src/main/com/thaiopensource/validate/schematron/NewSaxonSchemaReaderFactory.java 2011-06-24 11:58:33.065604560 +0300
+@@ -1,6 +1,6 @@
+ package com.thaiopensource.validate.schematron;
+
+-import net.sf.saxon.FeatureKeys;
++import net.sf.saxon.lib.FeatureKeys;
+ import net.sf.saxon.TransformerFactoryImpl;
+
+ import javax.xml.transform.TransformerFactory;
+@@ -12,6 +12,7 @@ public class NewSaxonSchemaReaderFactory
+ }
+
+ public void initTransformerFactory(TransformerFactory factory) {
++ factory.setAttribute(FeatureKeys.XSLT_VERSION, "2.0");
+ factory.setAttribute(FeatureKeys.LINE_NUMBERING, Boolean.TRUE);
+ factory.setAttribute(FeatureKeys.VERSION_WARNING, Boolean.FALSE);
+ }
diff --git a/jing-trang.spec b/jing-trang.spec
index 8ad144c..035422b 100644
--- a/jing-trang.spec
+++ b/jing-trang.spec
@@ -5,7 +5,7 @@
Name: jing-trang
Version: 20091111
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Schema validation and conversion based on RELAX NG
Group: Applications/Text
@@ -22,6 +22,8 @@ Patch0: %{name}-20091111-build.patch
# Saxon "HE" doesn't work for this, no old Saxon available, details in #655601
Patch1: %{name}-20091111-xalan.patch
Patch2: %{name}-20091111-datatype-sample.patch
+# http://code.google.com/p/jing-trang/source/detail?r=2356, #716177
+Patch3: %{name}-20091111-saxon93-716177.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -35,7 +37,7 @@ BuildRequires: jpackage-utils
BuildRequires: qdox
BuildRequires: relaxngDatatype
BuildRequires: relaxngDatatype-javadoc
-BuildRequires: saxon
+BuildRequires: saxon >= 9.3
BuildRequires: testng
BuildRequires: xalan-j2
BuildRequires: xerces-j2
@@ -103,6 +105,7 @@ format.
%patch0 -p1
%patch1 -p0
%patch2 -p1
+%patch3 -p1
sed -i -e 's/\r//g' lib/isorelax.copying.txt
find . -name "OldSaxon*.java" -delete # No "old" saxon available in Fedora
@@ -162,6 +165,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Fri Jun 24 2011 Ville Skyttä <ville.skytta at iki.fi> - 20091111-9
+- Apply upstream Saxon >= 9.3 patch (#716177).
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20091111-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list