pool/xmlgraphics-fop
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add xmlgraphics-commons to xmlgraphics-fop.script CLASSPATH, remove patch2 as it is no longer required

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/xmlgraphics-fop?expand=0&rev=3
This commit is contained in:
Michal Vyskocil 2010-11-05 08:31:26 +00:00 committed by Git OBS Bridge
parent b76d29a44f
commit fafa0245dc
3 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xmlgraphics-fop-java-opts.patch
View File

@ -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

2
xmlgraphics-fop.script
View File

@ -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

4
xmlgraphics-fop.spec
View File

@ -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)