Hello community,
here is the log from the commit of package docbook-xsl-stylesheets for
openSUSE:Factory checked in at 2014-02-15 17:16:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docbook-xsl-stylesheets (Old)
and /work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docbook-xsl-stylesheets"
Changes:
--------
---
/work/SRC/openSUSE:Factory/docbook-xsl-stylesheets/docbook-xsl-stylesheets.changes
2013-12-19 13:32:02.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
2014-02-15 17:16:29.000000000 +0100
@@ -1,0 +2,11 @@
+Thu Feb 6 13:30:10 UTC 2014 - t...@opensuse.org
+
+- Fixed bnc#842844 and added upstream patch from r9847 of docbook#1313
+ (File docbook-xsl-stylesheets-manpages-other-r9847.patch)
+
+-------------------------------------------------------------------
+Thu Feb 6 12:03:53 UTC 2014 - k...@suse.com
+
+- .spec: syntax fix.
+
+-------------------------------------------------------------------
New:
----
docbook-xsl-stylesheets-manpages-other-r9847.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docbook-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.jbC95u/_old 2014-02-15 17:16:29.000000000 +0100
+++ /var/tmp/diff_new_pack.jbC95u/_new 2014-02-15 17:16:29.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package docbook-xsl-stylesheets
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -48,6 +48,9 @@
## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-epub3-base.dir-r9742.patch Fix
for base.dir parameter
Patch10: %{name}-epub3-base.dir.patch
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-manpages-other-r9847.patch Fixed
upstream bug #1313
+Patch11: %{name}-manpages-other-r9847.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://sourceforge.net/projects/docbook/
@@ -89,6 +92,7 @@
%setup -q -n docbook-xsl-%{realversion} -b1
%patch0 -p1
%patch10 -p0
+%patch11 -p0
cp %{S:10} .
@@ -170,6 +174,7 @@
%exclude %{dbstyle_dir}/%{realversion}/slides/slidy/.htaccess
%exclude %{dbstyle_dir}/%{realversion}/slides/slidy/*/.htaccess
# %%exclude %%{dbstyle_dir}/svn-commit.tmp
+# %%exclude %%{dbstyle_dir}/%%{realversion}/*/*.xsl.orig
%config %{_sysconfdir}/xml/*.xml
++++++ docbook-xsl-stylesheets-manpages-other-r9847.patch ++++++
--- manpages/other.xsl.orig 2014-02-05 16:55:12.000000000 +0100
+++ manpages/other.xsl 2014-02-05 16:58:04.000000000 +0100
@@ -596,12 +596,22 @@
<xsl:with-param name="message-epilog"> (soelim stub)</xsl:with-param>
<xsl:with-param name="content">
<xsl:value-of select="'.so '"/>
- <xsl:call-template name="make.adjusted.man.filename">
- <xsl:with-param name="name" select="$first.refname"/>
- <xsl:with-param name="section" select="$section"/>
- <xsl:with-param name="lang" select="$lang"/>
- </xsl:call-template>
- <xsl:text> </xsl:text>
+ <xsl:variable name="full.filename">
+ <xsl:call-template name="make.adjusted.man.filename">
+ <xsl:with-param name="name" select="$first.refname"/>
+ <xsl:with-param name="section" select="$section"/>
+ <xsl:with-param name="lang" select="$lang"/>
+ </xsl:call-template>
+ </xsl:variable>
+ <xsl:choose>
+ <xsl:when test="starts-with($full.filename,
$man.output.base.dir)">
+ <xsl:value-of
select="substring-after($full.filename,$man.output.base.dir)"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$full.filename"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text> </xsl:text>
</xsl:with-param>
</xsl:call-template>
</xsl:if>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
