Hey Jeff,
Firstly thanks for the workaround. It pretty much fixed the issues for me,
though when I inspected the .spec file I noticed a few other lines (primarily
around the "BuildRequires"/" Requires " section) were still being placed on the
one line. I've attached a patch that adds to what you mentioned, that I believe
should fix all cases where the new line is being removed (as a workaround). I
wouldn't be surprised if this happened in other files as well but I haven't
looked at them.
Cheers Lee
Associate Software Engineer, RHCE
Red Hat Asia Pacific Pty Ltd
Level 1, 193 North Quay
Brisbane, QLD 4000, Australia
On 01/18/2013 03:21 PM, Ruediger Landmann wrote:
On 01/18/2013 02:57 PM, Laura Bailey wrote:
<blockquote>
Hi folks,
I upgraded from Fedora 17 to Fedora 18 today and repackaged Publican 3
only to discover that, while "publican build" still works just fine,
"publican package" results in the following error:
---
Using XML::LibXSLT on /usr/share/publican/xsl/web-spec.xsl
error: line 51: Too many names: %description -n
Red_Hat_Enterprise_Linux-Performance_Tuning_Guide-6-en-USThe
Performance Tuning Guide describes how to optimize the
/usr/bin/rpmbuild exited with value 1 at /usr/bin/publican line 924.
---
To update that, I still get the same error on Fedora 18 even with
Publican rebuilt against:
libxml2-2.9.0-3.fc18.x86_64
perl-XML-LibXML-2.0014-1.fc18.x86_64
libxslt-1.1.28-1.fc18.x86_64
perl-XML-LibXSLT-1.79-1.fc18.x86_64
(the final three of those deps I also rebuilt; only libxml2 is in the
F18 repos in that version, the others come from F19)
</blockquote>
Seems FC18 is eating a new line or two.
Work around: diff --git a/publican/datadir/xsl/web-spec.xsl
b/publican/datadir/xsl/web-spec.xsl index 9196c6c..0eb6b9d 100644
--- a/web-spec.xsl
+++ b/web-spec.xsl
@@ -64,6 +64,8 @@ Requires: xdg-utils <xsl:if test="$translation =
'1'"><xsl:value-of select="$language"/> translation of <xsl:value-of select="$
%description -l <xsl:value-of select="$lang"/> -n <xsl:value-of
select="$book-title"/>-<xsl:value-of selec +<xsl:text>
+</xsl:text>
<xsl:value-of select="$abstract" />
Cheers, Jeff.
--
Jeff Fearn <jfearn redhat com>
Senior Software Engineer
Infrastructure Engineering & Development (AEU)
Red Hat Asia Pacific Pty Ltd
GPG: 0x0357E8F0
--- <unnamed>
+++ <unnamed>
@@ -22,7 +22,8 @@
Release: <xsl:value-of select="$rpmrel"/>%{?dist}
<xsl:if test="$translation = '1'">Summary: <xsl:value-of select="$language"/> translation of <xsl:value-of select="$book-title"/>
Summary(<xsl:value-of select="$lang"/>): <xsl:value-of select="$full_subtitle"/></xsl:if>
-<xsl:if test="$translation != '1'">Summary: <xsl:value-of select="$full_subtitle"/></xsl:if>
+<xsl:if test="$translation != '1'">
+Summary: <xsl:value-of select="$full_subtitle"/></xsl:if>
Group: Documentation
License: <xsl:value-of select="$license"/>
URL: <xsl:value-of select="$url"/>
@@ -32,9 +33,12 @@
BuildRequires: publican >= <xsl:value-of select="$spec_version"/>
BuildRequires: desktop-file-utils
Requires: publican >= <xsl:value-of select="$spec_version"/>
-<xsl:if test="$brand != 'publican-common'">BuildRequires: <xsl:value-of select="$brand"/></xsl:if>
-<xsl:if test="$web_obsoletes != ''">Obsoletes: <xsl:value-of select="$web_obsoletes"/></xsl:if>
-<xsl:if test="$web_req != ''">Requires: <xsl:value-of select="$web_req"/></xsl:if>
+<xsl:if test="$brand != 'publican-common'">
+BuildRequires: <xsl:value-of select="$brand"/></xsl:if>
+<xsl:if test="$web_obsoletes != ''">
+Obsoletes: <xsl:value-of select="$web_obsoletes"/></xsl:if>
+<xsl:if test="$web_req != ''">
+Requires: <xsl:value-of select="$web_req"/></xsl:if>
Requires: <xsl:value-of select="$brand"/>-web
%description
@@ -57,13 +61,18 @@
%else
Requires: xdg-utils
%endif
-<xsl:if test="$dt_obsoletes != ''">Obsoletes: <xsl:value-of select="$dt_obsoletes"/></xsl:if>
-<xsl:if test="$dt_requires != ''">Requires: <xsl:value-of select="$dt_requires"/></xsl:if>
+<xsl:if test="$dt_obsoletes != ''">
+Obsoletes: <xsl:value-of select="$dt_obsoletes"/></xsl:if>
+<xsl:if test="$dt_requires != ''">
+Requires: <xsl:value-of select="$dt_requires"/></xsl:if>
%description -n <xsl:value-of select="$book-title"/>-<xsl:value-of select="$lang"/>
-<xsl:if test="$translation = '1'"><xsl:value-of select="$language"/> translation of <xsl:value-of select="$docname"/>
+<xsl:if test="$translation = '1'">
+<xsl:value-of select="$language"/> translation of <xsl:value-of select="$docname"/>
%description -l <xsl:value-of select="$lang"/> -n <xsl:value-of select="$book-title"/>-<xsl:value-of select="$lang"/> </xsl:if>
+<xsl:text>
+</xsl:text>
<xsl:value-of select="$abstract" />
%prep
_______________________________________________
publican-list mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/publican-list
Wiki: https://fedorahosted.org/publican
