From fafa0245dc37e457e6730c70402a5c2ab19e97116893925e01ac2ee82e825ec4 Mon Sep 17 00:00:00 2001
From: Michal Vyskocil <michal.vyskocil@gmail.com>
Date: Fri, 5 Nov 2010 08:31:26 +0000
Subject: [PATCH] add xmlgraphics-commons to xmlgraphics-fop.script CLASSPATH,
 remove patch2 as it is no longer required

OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=3
---
 xmlgraphics-fop-java-opts.patch | 21 ---------------------
 xmlgraphics-fop.script          |  2 +-
 xmlgraphics-fop.spec            |  4 +---
 3 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 xmlgraphics-fop-java-opts.patch

diff --git a/xmlgraphics-fop-java-opts.patch b/xmlgraphics-fop-java-opts.patch
deleted file mode 100644
index 5145fd3..0000000
--- a/xmlgraphics-fop-java-opts.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- fop
-+++ fop
-@@ -137,7 +137,8 @@
-   fi
- fi
- 
--if [ ! -x "$JAVACMD" ] ; then
-+# bnc#467866 fop fails if JAVACMD_OPTS is set
-+if [ ! -x "`echo $JAVACMD | cut -d ' ' -f 1`" ] ; then
-   echo "Error: JAVA_HOME is not defined correctly."
-   echo "  We cannot execute $JAVACMD"
-   exit 1
-@@ -247,7 +248,7 @@
- 
- # Execute FOP using eval/exec to preserve spaces in paths,
- # java options, and FOP args
--fop_exec_command="exec \"$JAVACMD\" $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
-+fop_exec_command="exec $JAVACMD $LOGCHOICE $LOGLEVEL -classpath \"$LOCALCLASSPATH\" $FOP_OPTS org.apache.fop.cli.Main $fop_exec_args"
- if $fop_exec_debug ; then
-     echo $fop_exec_command
- fi
diff --git a/xmlgraphics-fop.script b/xmlgraphics-fop.script
index beec4d3..570af76 100644
--- a/xmlgraphics-fop.script
+++ b/xmlgraphics-fop.script
@@ -24,7 +24,7 @@ fi
 
 # Rest of the configuration
 MAIN_CLASS=org.apache.fop.cli.Main
-BASE_JARS="xmlgraphics-fop xmlgraphics-batik/util xml-commons-jaxp-1.3-apis excalibur/avalon-framework-api xerces-j2 xalan-j2 xalan-j2-serializer"
+BASE_JARS="xmlgraphics-fop xmlgraphics-commons xmlgraphics-batik/util xml-commons-jaxp-1.3-apis excalibur/avalon-framework-api xerces-j2 xalan-j2 xalan-j2-serializer"
 
 # Set parameters
 set_jvm
diff --git a/xmlgraphics-fop.spec b/xmlgraphics-fop.spec
index eac2b55..ea48712 100644
--- a/xmlgraphics-fop.spec
+++ b/xmlgraphics-fop.spec
@@ -40,12 +40,11 @@ Summary:        Formatter for Printing XSLT Processed XML Files
 License:        The Apache Software License
 Group:          Productivity/Publishing/XML
 Source0:        http://www.apache.org/dist/xmlgraphics/fop/source/fop-%{version}-src.tar.gz
+#FIX-OPENSUSE: add xmlgraphics-commons to classpath
 Source1:        %{name}.script
 Source2:        http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/xmlgraphics-fop-pom-template.pom
 Patch0:         xmlgraphics-fop-build.patch
 Patch1:         xmlgraphics-fop-cli.patch
-# PATCH-FIX-UPSTREAM fop-0.95-java_opts.patch bnc#467866, bao#46771
-Patch2:         xmlgraphics-fop-java-opts.patch
 URL:            http://xmlgraphics.apache.org/fop/
 Requires(post):    jpackage-utils >= 1.7.4
 Requires(postun):  jpackage-utils >= 1.7.4
@@ -104,7 +103,6 @@ Javadoc for %{name}.
 find -name "*.jar" | xargs -t rm
 %patch0 -p0 -b .build
 %patch1 -p1 -b .cli
-%patch2 -b .java_opts
 
 pushd lib
 ln -s $(build-classpath excalibur/avalon-framework-api)