From 803eb9986db585b5502e757aa4fa5f8cb6215a05 Mon Sep 17 00:00:00 2001 From: Ruediger Landmann Date: Wed, 27 May 2015 09:20:50 +1000 Subject: [PATCH 1/2] new upstream --- .gitignore | 1 + publican.spec | 45 ++++++++++++++++++++++++++++++++++++++------- sources | 2 +- 3 files changed, 40 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 0aa1d4b..0e918df 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ Publican-2.1.tar.gz /Publican-v4.1.3.tar.gz /Publican-v4.1.6.tar.gz /Publican-v4.2.6.tar.gz +/Publican-v4.3.0.tar.gz diff --git a/publican.spec b/publican.spec index 9d0b9af..a9db330 100644 --- a/publican.spec +++ b/publican.spec @@ -21,7 +21,7 @@ %define wwwdir /var/www/html/docs Name: publican -Version: 4.2.6 +Version: 4.3.0 Release: 0%{?dist} Summary: Common files and scripts for publishing with DocBook XML # For a breakdown of the licensing, refer to LICENSE @@ -53,7 +53,7 @@ BuildRequires: perl(Archive::Tar) => 1.84 BuildRequires: perl(Archive::Zip) # Not reall required, but sometimes koji pulls in a conflicting dep... BuildRequires: perl(Compress::Zlib) => 2.030 -BuildRequires: perl(Locale::Maketext::Gettext) >= 1.27-1.2 +BuildRequires: perl(Locale::Maketext::Gettext) >= 1.27 BuildRequires: perl(Carp) BuildRequires: perl(Config::Simple) BuildRequires: perl(Cwd) @@ -115,7 +115,7 @@ BuildRequires: rpm-build libicu-devel # Most of these are handled automatically Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(Locale::Maketext::Gettext) >= 1.27-1.2 +Requires: perl(Locale::Maketext::Gettext) >= 1.27 Requires: rpm-build Requires: docbook-style-xsl >= 1.77.1 Requires: perl(XML::LibXML) >= 1.70 @@ -251,10 +251,10 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; %{_fixperms} $RPM_BUILD_ROOT/* -sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc-%{version}/en-US/index.html|' %{name}.desktop -sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc-%{version}/en-US/images/icon.svg|' %{name}.desktop -sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-releasenotes-%{version}/en-US/index.html|' %{name}-releasenotes.desktop -sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-releasenotes-%{version}/en-US/images/icon.svg|' %{name}-releasenotes.desktop +sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-doc%{!?_docdir_fmt:-%{version}}/en-US/index.html|' %{name}.desktop +sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-doc%{!?_docdir_fmt:-%{version}}/en-US/images/icon.svg|' %{name}.desktop +sed -i -e 's|@@FILE@@|%{_docdir}/%{name}-releasenotes%{!?_docdir_fmt:-%{version}}/en-US/index.html|' %{name}-releasenotes.desktop +sed -i -e 's|@@ICON@@|%{_docdir}/%{name}-releasenotes%{!?_docdir_fmt:-%{version}}/en-US/images/icon.svg|' %{name}-releasenotes.desktop desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}-releasenotes.desktop @@ -340,6 +340,37 @@ rm -rf $RPM_BUILD_ROOT %{wwwdir}/common-db5 %changelog +* Tue May 5 2015 Jeff Fearn 4.3.0-0 +- Fix web site templates to be more flexable. +- Tweak default website styles. +- Remove all FOP customisations. BZ #1168765 +- Use FontAwesome for aswesomeness. +- Switch DocBook-5 HTML to highlight.js. +- Change splash page group publish directory structure so it can be used directly. BZ #1186990 +- Fix duplicate link in Website docs. BZ #1188384 +- Fix PDF builds ignoring overrides.css and lang.css. BZ #1165005 +- Pulled in new/updated translations. BZ #1169605 +- Removed duplicate IDs from PUG. BZ #1197523 +- Removed the titlepage.xsl import from html-single due to breaking the xsl precedence. BZ #1187728 +- Fix Publican doesn't fallback to base_brand xsl files. BZ #1185127 +- Fix
elements being stripped in drupal-book builds. BZ #1158747 +- Fix malformed HTML/Drupal XML Feed for DocBook 5 content. BZ #1158740 +- Fix incorrect missing image warnings for drupal builds. BZ #1158725 +- Fix articles not building when using the drupal-book format. BZ #1164640 +- Fix initial title page content being skipped when a user defines a custom bookinfo id. BZ #1165482 +- Fix invalid XML being generated for drupal-book, when titles contain reserved chars. BZ #1165438 +- Changed the drupal feed field to use the url value instead of the title. BZ #1165724 +- Fix publican.cfg values are used in the feed page tag. BZ #1172402 +- Fix drupal content is dropped, if the element that is chunked has no id. BZ #1173421 +- Adjusted the XML output so anchors to something in the same page doesn't include the page url. +- Make legalnotice chunk in a similar way as chapters for drupal builds, so it's included in the feed. +- Enable section.label.includes.component.label for common-db5. BZ #1205952 +- Fix formalpara ids being dropped for DocBook 4.5. BZ #1209344 +- Add --no_clean option to allow custom entity files. BZ #1208069 + +* Tue Feb 24 2015 Petr Pisar <ppisar@redhat.com> - 4.2.6-1 +- Fix versions in Perl module dependencies again + * Tue Oct 21 2014 Jeff Fearn <jfearn@redhat.com> 4.2.6-0 - Fix External_Links translation not merging. BZ #1153911 diff --git a/sources b/sources index c159eac..886befb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -885e7adf54f14d313fc10bec4eea0235 Publican-v4.2.6.tar.gz +95564b6559661c7c7266f17f0502ae31 Publican-v4.3.0.tar.gz From 29b5686cc1f3f08dfd0dde960ae606f04de49f8e Mon Sep 17 00:00:00 2001 From: Jeff Fearn <jfearn@redhat.com> Date: Mon, 14 Sep 2015 13:03:15 +1000 Subject: [PATCH 2/2] new upstream --- .gitignore | 1 + publican.spec | 18 ++++++++++++------ sources | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 0e918df..801df2f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ Publican-2.1.tar.gz /Publican-v4.1.6.tar.gz /Publican-v4.2.6.tar.gz /Publican-v4.3.0.tar.gz +/Publican-v4.3.2.tar.gz diff --git a/publican.spec b/publican.spec index a9db330..6d13068 100644 --- a/publican.spec +++ b/publican.spec @@ -21,7 +21,7 @@ %define wwwdir /var/www/html/docs Name: publican -Version: 4.3.0 +Version: 4.3.2 Release: 0%{?dist} Summary: Common files and scripts for publishing with DocBook XML # For a breakdown of the licensing, refer to LICENSE @@ -53,7 +53,7 @@ BuildRequires: perl(Archive::Tar) => 1.84 BuildRequires: perl(Archive::Zip) # Not reall required, but sometimes koji pulls in a conflicting dep... BuildRequires: perl(Compress::Zlib) => 2.030 -BuildRequires: perl(Locale::Maketext::Gettext) >= 1.27 +BuildRequires: perl-Locale-Maketext-Gettext >= 1.27-1.2 BuildRequires: perl(Carp) BuildRequires: perl(Config::Simple) BuildRequires: perl(Cwd) @@ -115,7 +115,7 @@ BuildRequires: rpm-build libicu-devel # Most of these are handled automatically Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) -Requires: perl(Locale::Maketext::Gettext) >= 1.27 +Requires: perl-Locale-Maketext-Gettext >= 1.27-1.2 Requires: rpm-build Requires: docbook-style-xsl >= 1.77.1 Requires: perl(XML::LibXML) >= 1.70 @@ -340,6 +340,15 @@ rm -rf $RPM_BUILD_ROOT %{wwwdir}/common-db5 %changelog +* Tue Jul 28 2015 Lee Newson <lnewson@redhat.com> 4.3.2-0 +- Do not replace non-breaking spaces by spaces in msgid of POT files. BZ #1233202 +- Fixed Unwanted line breaks around <inlinemediaobject> images. BZ #1222067 +- Fixed EPUB output of db5 brands can't be viewed. BZ #1241348 + +* Thu Jun 18 2015 Lee Newson <lnewson@redhat.com> 4.3.1-0 +- Fixed a regression in 4.3.0 that caused TOC's not to be included in wkhtmltopdf PDF's. BZ #1230023 +- Fixed callout image urls being broken. BZ #1222716 + * Tue May 5 2015 Jeff Fearn <jfearn@redhat.com> 4.3.0-0 - Fix web site templates to be more flexable. - Tweak default website styles. @@ -368,9 +377,6 @@ rm -rf $RPM_BUILD_ROOT - Fix formalpara ids being dropped for DocBook 4.5. BZ #1209344 - Add --no_clean option to allow custom entity files. BZ #1208069 -* Tue Feb 24 2015 Petr Pisar <ppisar@redhat.com> - 4.2.6-1 -- Fix versions in Perl module dependencies again - * Tue Oct 21 2014 Jeff Fearn <jfearn@redhat.com> 4.2.6-0 - Fix External_Links translation not merging. BZ #1153911 diff --git a/sources b/sources index 886befb..9d6b0ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -95564b6559661c7c7266f17f0502ae31 Publican-v4.3.0.tar.gz +7f9726fe568b6b686f4bbe1fe2dd5439 Publican-v4.3.2.tar.gz