Hello community,

here is the log from the commit of package bsh2 for openSUSE:Factory
checked in at Mon Mar 14 10:53:44 CET 2011.



--------
--- bsh2/bsh2.changes   2010-08-09 13:32:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/bsh2/bsh2.changes      2011-03-11 
10:39:50.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Mar 11 09:37:31 UTC 2011 - [email protected]
+
+- Fix build of documentation, remove xalan-j2 dependency
+  * add bsh-2.0b5-docs.patch
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


New:
----
  bsh-2.0b5-docs.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bsh2.spec ++++++
--- /var/tmp/diff_new_pack.yn2KJb/_old  2011-03-14 10:52:50.000000000 +0100
+++ /var/tmp/diff_new_pack.yn2KJb/_new  2011-03-14 10:52:50.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package bsh2 (Version 2.0.0.b5)
+# spec file for package bsh2
 #
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
 # All rights reserved.
 #
@@ -25,7 +25,7 @@
 
 Name:           bsh2
 Version:        2.0.0.b5
-Release:        6
+Release:        10
 Summary:        Lightweight Scripting for Java (BeanShell Version 2.x)
 License:        LGPLv2.1+
 Group:          Development/Libraries/Java
@@ -42,6 +42,8 @@
 Source9:        bsh-engine-2.0b5.pom
 Patch1:         %{name}-asm.patch
 Patch2:         %{name}-ClassGeneratorUtil.patch
+#PATCH-FIX-OPENSUSE: use html output and JVM's built-in xmlns:redirect
+Patch3:         bsh-2.0b5-docs.patch
 #PATCH-FIX-OPENSUSE: those two patches fixes a compatibility with a standard 
javax.script API
 Patch1000:      bsh2-fix-tests.patch
 Patch1001:      bsh2-standard-script-api.patch
@@ -61,7 +63,7 @@
 BuildRequires:  bsf-javadoc
 BuildRequires:  jpackage-utils >= 1.7.5
 BuildRequires:  ant-trax
-BuildRequires:  xalan-j2
+#BuildRequires:  xalan-j2
 BuildRequires:  fdupes
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -163,6 +165,7 @@
 %setup -q -n %{Name}-%{fversion}
 %patch1 -p1
 %patch2 -p0
+%patch3 -p1
 %patch1000 -p1
 %patch1001 -p1
 for j in $(find . -name "*.jar"); do


++++++ bsh-2.0b5-docs.patch ++++++
Index: BeanShell-2.0b5/docs/faq/faq.xsl
===================================================================
--- BeanShell-2.0b5.orig/docs/faq/faq.xsl       2005-06-10 19:20:48.000000000 
+0200
+++ BeanShell-2.0b5/docs/faq/faq.xsl    2011-03-11 10:22:15.465882372 +0100
@@ -18,7 +18,7 @@
 <!--xsl:param name="imagedir"/-->
 
 <!-- Output directives -->
-<xsl:output method="xhtml" indent="yes"/>
+<xsl:output method="html" indent="yes"/>
 
 <!-- 
        Root
Index: BeanShell-2.0b5/docs/manual/xsl/manual.xsl
===================================================================
--- BeanShell-2.0b5.orig/docs/manual/xsl/manual.xsl     2005-06-10 
19:20:50.000000000 +0200
+++ BeanShell-2.0b5/docs/manual/xsl/manual.xsl  2011-03-11 10:29:22.272450854 
+0100
@@ -1,6 +1,6 @@
 <xsl:stylesheet        
        xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; version="1.0"
-    xmlns:redirect="org.apache.xalan.xslt.extensions.Redirect"
+        xmlns:redirect="http://xml.apache.org/xalan/redirect";
     extension-element-prefixes="redirect"
 >
 
@@ -29,7 +29,7 @@
 <xsl:param name="pagesdir"/>
 
 <!-- Output directives -->
-<xsl:output method="xhtml" indent="no"/>
+<xsl:output method="html" indent="no"/>
 
 <!-- 
        Root









++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to