Hello community,
here is the log from the commit of package docbook-xsl-stylesheets for
openSUSE:Factory checked in at 2013-12-19 13:32:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-10-01 08:10:49.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.docbook-xsl-stylesheets.new/docbook-xsl-stylesheets.changes
2013-12-19 13:32:02.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Dec 9 13:49:49 UTC 2013 - [email protected]
+
+- Added missing patch description to follow Patch Guidlines
+ (see http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines)
+- Added upstream patch (r9732-r9743 for base.dir parameter in EPUB3)
+
+-------------------------------------------------------------------
New:
----
docbook-xsl-stylesheets-epub3-base.dir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docbook-xsl-stylesheets.spec ++++++
--- /var/tmp/diff_new_pack.ozD6Fa/_old 2013-12-19 13:32:03.000000000 +0100
+++ /var/tmp/diff_new_pack.ozD6Fa/_new 2013-12-19 13:32:03.000000000 +0100
@@ -16,11 +16,13 @@
#
+%define realversion 1.78.1
+
%define dbstyle_dir %{_datadir}/xml/docbook/stylesheet/nwalsh
%define dbstyle_catalog %{name}.xml
%define suse_catalog %{_sysconfdir}/xml/suse-catalog.xml
%define xmlcatalog %{_bindir}/xmlcatalog
-%define dbstyle_catalog_entry for-catalog-%{name}-%{version}.xml
+%define dbstyle_catalog_entry for-catalog-%{name}-%{realversion}.xml
Name: docbook-xsl-stylesheets
Summary: XSL Stylesheets for DocBook 4
@@ -34,12 +36,18 @@
Requires: docbook_4
Requires: xmlcharent
PreReq: sgml-skel %{_bindir}/xmlcatalog
-Version: 1.78.1
+Version: 1.78.1+svn9743
Release: 0
-Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{version}.tar.bz2
-Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{version}.tar.bz2
+Source0:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-%{realversion}.tar.bz2
+Source1:
http://switch.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-doc-%{realversion}.tar.bz2
Source10: dbxslt-install.sh
+
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-dbtoepub.patch Fixed dirname
Patch0: %{name}-dbtoepub.patch
+
+## PATCH-FIX-OPENSUSE docbook-xsl-stylesheets-epub3-base.dir-r9742.patch Fix
for base.dir parameter
+Patch10: %{name}-epub3-base.dir.patch
+
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://sourceforge.net/projects/docbook/
@@ -78,8 +86,10 @@
#--------------------------------------------------------------------------
%prep
-%setup -q -n docbook-xsl-%{version} -b1
+%setup -q -n docbook-xsl-%{realversion} -b1
%patch0 -p1
+%patch10 -p0
+
cp %{S:10} .
#--------------------------------------------------------------------------
@@ -100,7 +110,7 @@
#--------------------------------------------------------------------------
%install
-sh ./dbxslt-install.sh --package-version=%{version} --buildroot=%{buildroot}
+sh ./dbxslt-install.sh --package-version="%{realversion}"
--buildroot=%{buildroot}
# fixing permission errors from sources
@@ -109,7 +119,7 @@
#
if ! echo %{S:0} | grep -q snapshot; then
pushd %{buildroot}%{dbstyle_dir} >/dev/null
- ln -sf %{version} current
+ ln -sf %{realversion} current
popd >/dev/null
fi
@@ -155,10 +165,10 @@
%dir %{_datadir}/xml/docbook/stylesheet
%dir %{_datadir}/xml/docbook/stylesheet/nwalsh
-%dir %{dbstyle_dir}/%{version}
+%dir %{dbstyle_dir}/%{realversion}
-%exclude %{dbstyle_dir}/%{version}/slides/slidy/.htaccess
-%exclude %{dbstyle_dir}/%{version}/slides/slidy/*/.htaccess
+%exclude %{dbstyle_dir}/%{realversion}/slides/slidy/.htaccess
+%exclude %{dbstyle_dir}/%{realversion}/slides/slidy/*/.htaccess
# %%exclude %%{dbstyle_dir}/svn-commit.tmp
%config %{_sysconfdir}/xml/*.xml
@@ -166,7 +176,7 @@
%doc BUGS NEWS README RELEASE-NOTES.txt TODO
%{dbstyle_dir}/current
-%{dbstyle_dir}/%{version}/*
+%{dbstyle_dir}/%{realversion}/*
%files scripts
%defattr(-, root, root)
++++++ docbook-xsl-stylesheets-epub3-base.dir.patch ++++++
Index: epub3/epub3-element-mods.xsl
===================================================================
--- epub3/epub3-element-mods.xsl (revision 9732)
+++ epub3/epub3-element-mods.xsl (revision 9831)
@@ -49,7 +49,33 @@
</xsl:param>
<xsl:param name="generate.manifest" select="0"/>
<xsl:param name="manifest.in.base.dir" select="1"/>
-<xsl:param name="base.dir" select="'OEBPS/'"/>
+
+<!-- HTML chunk output goes to $base.dir/OEPBS -->
+<xsl:variable name="chunk.base.dir">
+ <xsl:if test="$base.dir != '' and contains($base.dir, $epub.oebps.dir)">
+ <xsl:message terminate="yes">
+ <xsl:text>ERROR: the $base.dir param must not include the </xsl:text>
+ <xsl:value-of select="$epub.oebps.dir"/>
+ <xsl:text> directory in its path. Exiting.</xsl:text>
+ </xsl:message>
+ </xsl:if>
+ <xsl:choose>
+ <xsl:when test="string-length($base.dir) = 0"></xsl:when>
+ <!-- make sure to add trailing slash if omitted by user -->
+ <xsl:when test="substring($base.dir, string-length($base.dir), 1) = '/'">
+ <xsl:value-of select="$base.dir"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="concat($base.dir, '/')"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:value-of select="$epub.oebps.dir"/>
+ <xsl:if test="substring($epub.oebps.dir, string-length($epub.oebps.dir), 1)
!= '/'">
+ <xsl:text>/</xsl:text>
+ </xsl:if>
+</xsl:variable>
+
+
<xsl:param name="index.links.to.section" select="0"/>
<!-- Epub does not yet support external links -->
@@ -101,10 +127,10 @@
name="epub.vocabulary.profile.package">http://www.idpf.org/epub/30/profile/package/</xsl:param>
<xsl:param name="epub.output.epub.types" select="1"/>
<xsl:param name="epub.oebps.dir" select="'OEBPS'"/>
-<xsl:param name="epub.metainf.dir" select="'META-INF/'"/>
+<xsl:variable name="epub.metainf.dir" select="'META-INF/'"/>
<xsl:param name="epub.ncx.filename" select="'toc.ncx'"/>
-<xsl:param name="epub.mimetype.filename" select="'mimetype'"/>
-<xsl:param name="epub.mimetype.value" select="'application/epub+zip'"/>
+<xsl:variable name="epub.mimetype.filename" select="'mimetype'"/>
+<xsl:variable name="epub.mimetype.value" select="'application/epub+zip'"/>
<xsl:param name="epub.container.filename" select="'container.xml'"/>
<xsl:param name="epub.package.filename" select="'package.opf'"/>
<xsl:param name="epub.cover.filename" select="concat('cover', $html.ext)"/>
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
