rpms/docbook-style-xsl/F-10 .cvsignore, 1.22, 1.23 docbook-style-xsl.Makefile, 1.7, 1.8 docbook-style-xsl.spec, 1.51, 1.52 docbook-xsl-marginleft.patch, 1.7, 1.8 sources, 1.22, 1.23 docbook-xsl-weird-orgname-use.patch, 1.1, NONE
Ondrej Vasik
ovasik at fedoraproject.org
Mon Nov 2 09:43:15 UTC 2009
Author: ovasik
Update of /cvs/extras/rpms/docbook-style-xsl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31745
Modified Files:
.cvsignore docbook-style-xsl.Makefile docbook-style-xsl.spec
docbook-xsl-marginleft.patch sources
Removed Files:
docbook-xsl-weird-orgname-use.patch
Log Message:
new upstream release 1.75.2 (required for Publican 1.0) - #532259 , update Makefile(do ship .svg images(#486849), xsl stylesheets for website, , xhtml-1_1, docbook -> epub convertor)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore 3 Jun 2008 11:16:45 -0000 1.22
+++ .cvsignore 2 Nov 2009 09:43:14 -0000 1.23
@@ -1,2 +1,2 @@
-docbook-xsl-1.74.0.tar.gz
-docbook-xsl-doc-1.74.0.tar.bz2
+docbook-xsl-1.75.2.tar.bz2
+docbook-xsl-doc-1.75.2.tar.bz2
Index: docbook-style-xsl.Makefile
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/docbook-style-xsl.Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- docbook-style-xsl.Makefile 18 Jun 2007 15:39:19 -0000 1.7
+++ docbook-style-xsl.Makefile 2 Nov 2009 09:43:14 -0000 1.8
@@ -3,10 +3,10 @@ DESTDIR = ..overridden in spec file..
all: install
-install: install-xsl install-img install-extensions install-misc
+install: install-xsl install-img install-extensions install-misc install-epub
install-xsl:
- mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,manpages,profiling,highlighting,roundtrip}
+ mkdir -p $(DESTDIR)/{common,fo,html,htmlhelp/doc,javahelp,lib,template,xhtml,xhtml-1_1,manpages,profiling,highlighting,roundtrip,website}
cp common/*.dtd $(DESTDIR)/common
cp common/*.ent $(DESTDIR)/common
cp common/*.xml $(DESTDIR)/common
@@ -20,22 +20,32 @@ install-xsl:
cp lib/*.xsl $(DESTDIR)/lib
cp template/*.xsl $(DESTDIR)/template
cp xhtml/*.xsl $(DESTDIR)/xhtml
+ cp xhtml-1_1/*.xsl $(DESTDIR)/xhtml-1_1
cp manpages/*.xsl $(DESTDIR)/manpages
cp profiling/*.xsl $(DESTDIR)/profiling
cp highlighting/*.xml $(DESTDIR)/highlighting
cp highlighting/*.xsl $(DESTDIR)/highlighting
cp roundtrip/*.xml $(DESTDIR)/roundtrip
cp roundtrip/*.xsl $(DESTDIR)/roundtrip
+ cp roundtrip/*.dtd $(DESTDIR)/roundtrip
+ cp website/*.xsl $(DESTDIR)/website
install-img:
mkdir -p $(DESTDIR)/images/callouts
cp images/*.gif $(DESTDIR)/images
cp images/*.png $(DESTDIR)/images
+ cp images/*.svg $(DESTDIR)/images
cp images/callouts/*.png $(DESTDIR)/images/callouts
+ cp images/callouts/*.gif $(DESTDIR)/images/callouts
+ cp images/callouts/*.svg $(DESTDIR)/images/callouts
install-extensions:
mkdir -p $(DESTDIR)/extensions
cp -r extensions/* $(DESTDIR)/extensions
+install-epub:
+ mkdir -p $(DESTDIR)/epub
+ cp -r epub/* ${DESTDIR}/epub
+
install-misc:
cp VERSION $(DESTDIR)
Index: docbook-style-xsl.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/docbook-style-xsl.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- docbook-style-xsl.spec 11 Feb 2009 17:14:10 -0000 1.51
+++ docbook-style-xsl.spec 2 Nov 2009 09:43:14 -0000 1.52
@@ -1,6 +1,6 @@
Name: docbook-style-xsl
-Version: 1.74.0
-Release: 5%{?dist}
+Version: 1.75.2
+Release: 1%{?dist}
Group: Applications/Text
Summary: Norman Walsh's XSL stylesheets for DocBook XML
@@ -21,7 +21,7 @@ Conflicts: passivetex < 1.21
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch
-Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/docbook/docbook-xsl-%{version}.tar.bz2
Source1: %{name}.Makefile
Source2: http://downloads.sourceforge.net/docbook/docbook-xsl-doc-%{version}.tar.bz2
@@ -30,8 +30,6 @@ Patch2: docbook-xsl-marginleft.patch
Patch3: docbook-xsl-newmethods.patch
Patch4: docbook-xsl-non-constant-expressions.patch
Patch5: docbook-xsl-list-item-body.patch
-Patch6: docbook-xsl-weird-orgname-use.patch
-
%description
These XSL stylesheets allow you to transform any DocBook XML document to
@@ -48,7 +46,6 @@ popd
%patch3 -p1 -b .newmethods
%patch4 -p1 -b .nonconstant
%patch5 -p1 -b .listitembody
-%patch6 -p1 -b .orgname
cp -p %{SOURCE1} Makefile
@@ -119,11 +116,20 @@ if [ "$1" = 0 ]; then
fi
%changelog
+* Mon Nov 02 2009 Ondrej Vasik <ovasik at redhat.com> 1.75.2-1
+- new upstream release 1.75.2 (required for Publican 1.0)
+ (#532259)
+- update marginleft patch, remove weird-orgname
+ patch addressed by upstream
+- updated Makefile: do ship .svg images(#486849), xsl
+ stylesheets for website, xhtml-1_1, docbook -> epub
+ convertor
+
* Wed Feb 11 2009 Ondrej Vasik <ovasik at redhat.com> 1.74.0-5
- Fix broken varlistentry (#479683)
* Fri Dec 12 2008 Ondrej Vasik <ovasik at redhat.com> 1.74.0-4
-- Author_Group "<orgname>" merged between "<surname>"
+- Author_Group "<orgname>" merged between "<surname>"
and "<surname>" (#473019)
* Wed Aug 06 2008 Kamil Dudka <kdudka at redhat.com> 1.74.0-3
docbook-xsl-marginleft.patch:
docbook-xsl-1.74.0/fo/lists.xsl | 34 ++++------------------------------
docbook-xsl-1.74.0/fo/param.xsl | 4 ++--
docbook-xsl-1.75.0/fo/pagesetup.xsl | 11 +----------
3 files changed, 7 insertions(+), 42 deletions(-)
Index: docbook-xsl-marginleft.patch
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/docbook-xsl-marginleft.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- docbook-xsl-marginleft.patch 6 Aug 2008 11:56:12 -0000 1.7
+++ docbook-xsl-marginleft.patch 2 Nov 2009 09:43:14 -0000 1.8
@@ -63,24 +63,24 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/li
</xsl:variable>
<xsl:if test="title">
-diff -ruNp docbook-xsl-1.74.0.orig/fo/pagesetup.xsl docbook-xsl-1.74.0/fo/pagesetup.xsl
---- docbook-xsl-1.74.0.orig/fo/pagesetup.xsl 2008-08-06 13:31:11.000000000 +0200
-+++ docbook-xsl-1.74.0/fo/pagesetup.xsl 2008-08-06 13:32:46.000000000 +0200
-@@ -34,29 +34,11 @@
- margin-left="{$page.margin.outer} - {$title.margin.left}"
- -->
- <xsl:param name="margin.left.outer">
-- <xsl:choose>
-- <xsl:when test="$passivetex.extensions != 0">
-- <xsl:value-of select="$page.margin.outer"/>
-- </xsl:when>
-- <xsl:otherwise>
-- <xsl:value-of select="$page.margin.outer"/>
-- <xsl:text> - </xsl:text>
-- <xsl:value-of select="$title.margin.left"/>
-- </xsl:otherwise>
-- </xsl:choose>
-+ <xsl:value-of select="$page.margin.outer"/>
+diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
+--- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200
++++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200
+@@ -133,8 +133,8 @@
+ <xsl:attribute-set name="component.title.properties">
+ <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
+ <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
+- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
+- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
++ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
++ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
+ <xsl:attribute name="hyphenate">false</xsl:attribute>
+ <xsl:attribute name="text-align">
+ <xsl:choose>
+diff -urNp docbook-xsl-1.75.0-orig/fo/pagesetup.xsl docbook-xsl-1.75.0/fo/pagesetup.xsl
+--- docbook-xsl-1.75.0-orig/fo/pagesetup.xsl 2009-05-11 11:40:49.000000000 +0200
++++ docbook-xsl-1.75.0/fo/pagesetup.xsl 2009-05-11 11:42:29.000000000 +0200
+@@ -30,16 +30,7 @@
</xsl:param>
<xsl:param name="margin.left.inner">
@@ -98,17 +98,3 @@ diff -ruNp docbook-xsl-1.74.0.orig/fo/pa
</xsl:param>
<xsl:template name="setup.pagemasters">
-diff -ruNp docbook-xsl-1.74.0.orig/fo/param.xsl docbook-xsl-1.74.0/fo/param.xsl
---- docbook-xsl-1.74.0.orig/fo/param.xsl 2008-06-02 01:06:18.000000000 +0200
-+++ docbook-xsl-1.74.0/fo/param.xsl 2008-08-06 13:32:46.000000000 +0200
-@@ -133,8 +133,8 @@
- <xsl:attribute-set name="component.title.properties">
- <xsl:attribute name="keep-with-next.within-column">always</xsl:attribute>
- <xsl:attribute name="space-before.optimum"><xsl:value-of select="concat($body.font.master, 'pt')"/></xsl:attribute>
-- <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master, 'pt * 0.8')"/></xsl:attribute>
-- <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master, 'pt * 1.2')"/></xsl:attribute>
-+ <xsl:attribute name="space-before.minimum"><xsl:value-of select="concat($body.font.master*0.8, 'pt')"/></xsl:attribute>
-+ <xsl:attribute name="space-before.maximum"><xsl:value-of select="concat($body.font.master*1.2, 'pt')"/></xsl:attribute>
- <xsl:attribute name="hyphenate">false</xsl:attribute>
- <xsl:attribute name="text-align">
- <xsl:choose>
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook-style-xsl/F-10/sources,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- sources 3 Jun 2008 11:16:45 -0000 1.22
+++ sources 2 Nov 2009 09:43:14 -0000 1.23
@@ -1,2 +1,2 @@
-c9afc756e127ac91486ad28748b679c3 docbook-xsl-1.74.0.tar.gz
-3a38cdcfadfacd75ebd1ab6c423d4fd6 docbook-xsl-doc-1.74.0.tar.bz2
+0c76a58a8e6cb5ab49f819e79917308f docbook-xsl-1.75.2.tar.bz2
+0a59c4c1796683fca32881c221df0b16 docbook-xsl-doc-1.75.2.tar.bz2
--- docbook-xsl-weird-orgname-use.patch DELETED ---
More information about the fedora-extras-commits
mailing list