Hello community, here is the log from the commit of package fop for openSUSE:Factory checked in at Thu Feb 26 16:54:45 CET 2009. -------- --- fop/fop.changes 2008-08-06 15:25:40.000000000 +0200 +++ fop/fop.changes 2009-02-26 13:53:15.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 26 13:52:34 CET 2009 - mvyskocil@suse.cz + +- fixed bnc#467866 - fop fails if JAVACMD_OPTS is set + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- fop-0.95-java_opts.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fop.spec ++++++ --- /var/tmp/diff_new_pack.QK1660/_old 2009-02-26 16:48:03.000000000 +0100 +++ /var/tmp/diff_new_pack.QK1660/_new 2009-02-26 16:48:03.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package fop (Version 0.95) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,10 +24,12 @@ Summary: Formatter for Printing XSLT Processed XML Files Requires: jre Version: 0.95 -Release: 1 +Release: 25 Url: http://xml.apache.org/fop/ Source0: http://apache.easy-webs.de/xml/fop/fop-%{version}-src.tar.gz Source1: fop-sh +# PATCH-FIX-UPSTREAM fop-0.95-java_opts.patch bnc#467866, bao#46771 +Patch0: fop-0.95-java_opts.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch BuildRequires: ant-junit ant-trax java-1_4_2-gcj-compat-devel unzip xml-commons-apis xml-commons-resolver @@ -45,6 +47,7 @@ %prep %setup -q cat %{S:1} | sed s=@FOP_HOME@=%{_datadir}/%{name}= > fop.sh +%patch0 -b .java_opts %build export JAVA_HOME=/usr/lib/jvm/java @@ -85,6 +88,8 @@ %{_datadir}/%{name}-%{version}/ %changelog +* Thu Feb 26 2009 mvyskocil@suse.cz +- fixed bnc#467866 - fop fails if JAVACMD_OPTS is set * Wed Aug 06 2008 skh@suse.de - update to version 0.95, list of changes at: http://xmlgraphics.apache.org/fop/0.95/changes_0.95.html @@ -103,7 +108,7 @@ * Tue Jul 10 2007 skh@suse.de - update to version 0.93 - build with gcj -* Mon May 07 2007 ro@suse.de +* Sun May 06 2007 ro@suse.de - added unzip to buildrequires * Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires ++++++ fop-0.95-java_opts.patch ++++++ --- 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 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org