[xmlbeans/f17] Fix classpath for scripts (#892690)

[Matt Spaulding]

commit 8cfea08bdbc5c0aef5c3925c1196dec5cd3dd358
Author: Matt Spaulding <mspaulding06 at gmail.com>
Date:   Sun Mar 3 14:24:41 2013 -0800

    Fix classpath for scripts (#892690)

 xmlbeans-scripts-classpath.patch |  145 ++++++++++++++++++++++++++++++++++++++
 xmlbeans.spec                    |    7 ++-
 2 files changed, 151 insertions(+), 1 deletions(-)
---
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 <mspaulding06 at gmail.com> - 2.6.0-2
+- Fixed classpath issue with scripts (#892690)
+
 * 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)