[publican/f19] patched version of new upstream

Rüdiger Landmann rlandmann at fedoraproject.org
Thu Mar 21 04:46:43 UTC 2013 

commit abcc5de40417e46e15f888e84549740e5b5610f1
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Thu Mar 21 14:46:30 2013 +1000

    patched version of new upstream

 .gitignore    |    4 +++
 publican.spec |   74 +++++++++++++++++++++++++++++++++++++++++++++-----------
 sources       |    4 +++
 3 files changed, 67 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 92def33..64cc210 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,7 @@ Publican-2.1.tar.gz
 /Publican-2.8.tar.gz
 /Publican-v3.0.0.tar.gz
 /xsl-newlines.patch
+/Publican-v3.1.5.tar.gz
+/nopdfcover.patch
+/nopdftest.patch
+/xsl-newlines-315.patch
diff --git a/publican.spec b/publican.spec
index e00a7a3..939c6a5 100644
--- a/publican.spec
+++ b/publican.spec
@@ -10,12 +10,12 @@
 # required for desktop file install
 %define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat")
 
-%define TESTS 0
+%define TESTS 1
 %define brand common
 %define wwwdir /var/www/html/docs
 
 Name:           publican
-Version:        3.0.0
+Version:        3.1.5
 Release:        1%{?dist}
 Summary:        Common files and scripts for publishing with DocBook XML
 # For a breakdown of the licensing, refer to LICENSE
@@ -42,7 +42,7 @@ BuildRequires:  perl(Test::Pod) => 1.14
 BuildRequires:  perl(Test::Pod::Coverage) => 1.04
 BuildRequires:  perl(Archive::Tar)
 BuildRequires:  perl(Archive::Zip)
-BuildRequires:  perl(Locale::Maketext::Gettext)
+BuildRequires:  perl(Locale::Maketext::Gettext) >= 1.27-1.2
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(Config::Simple)
 BuildRequires:  perl(Cwd)
@@ -84,18 +84,20 @@ BuildRequires:  perl(XML::LibXML) => 1.67
 BuildRequires:  perl(XML::LibXSLT) => 1.67
 BuildRequires:  perl(XML::Simple)
 BuildRequires:  perl(XML::TreeBuilder) => 4.0
-BuildRequires:  wkhtmltopdf
-BuildRequires:  docbook-style-xsl >= 1.76.1
+BuildRequires:  wkhtmltopdf >= 0.10.0_rc2-5
+BuildRequires:  docbook-style-xsl >= 1.77.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  perl(Text::CSV_XS)
+BuildRequires:  perl(Sort::Versions)
+BuildRequires:  perl(DBD::SQLite)
 
 # Most of these are handled automatically
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires:       perl(Locale::Maketext::Gettext)
-Requires:       wkhtmltopdf
+Requires:       perl(Locale::Maketext::Gettext)  >= 1.27-1.2
+Requires:       wkhtmltopdf >= 0.10.0_rc2-5
 Requires:       rpm-build
-Requires:       docbook-style-xsl >= 1.76.1
+Requires:       docbook-style-xsl >= 1.77.1
 Requires:       perl(XML::LibXML)  >=  1.67
 Requires:       perl(XML::LibXSLT) >=  1.67
 Requires:       perl(XML::TreeBuilder) >= 4.0
@@ -118,7 +120,7 @@ Requires:       lohit-malayalam-fonts lohit-marathi-fonts lohit-nepali-fonts
 Requires:       lohit-oriya-fonts lohit-punjabi-fonts lohit-sindhi-fonts
 Requires:       lohit-tamil-fonts lohit-telugu-fonts dejavu-lgc-sans-mono-fonts
 Requires:       dejavu-fonts-common dejavu-serif-fonts dejavu-sans-fonts
-Requires:       dejavu-sans-mono-fonts
+Requires:       dejavu-sans-mono-fonts overpass-fonts
 
 BuildRequires:  liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
 BuildRequires:  cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
@@ -127,14 +129,16 @@ BuildRequires:  lklug-fonts baekmuk-ttf-batang-fonts
 %if %{OTHER}
 Requires:       liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
 Requires:       cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
-Requires:       lklug-fonts baekmuk-ttf-batang-fonts
+Requires:       lklug-fonts baekmuk-ttf-batang-fonts overpass-fonts
 
 BuildRequires:  liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
 BuildRequires:  cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
 BuildRequires:  lklug-fonts baekmuk-ttf-batang-fonts
 %endif
 
-Patch0:         xsl-newlines.patch
+Patch0:         xsl-newlines-315.patch
+Patch1:		nopdfcover.patch
+Patch2:		nopdftest.patch
 
 %description
 Publican is a DocBook publication system, not just a DocBook processing tool.
@@ -164,10 +168,12 @@ Website style for common brand.
 %prep
 %setup -q -n Publican-v%{version}
 %patch0 -p 1
+%patch1 -p 1
+%patch2 -p 1
 
 %build
 %{__perl} Build.PL installdirs=vendor --nocolours=1
-./Build
+./Build --nocolours=1
 dir=`pwd` && cd Users_Guide && %{__perl} -CA -I $dir/blib/lib $dir/blib/script/publican build \
     --formats=html-desktop --publish --langs=all \
     --common_config="$dir/blib/datadir" \
@@ -203,7 +209,7 @@ cd -
 
 %check
 %if %{TESTS}
-./Build test
+./Build --nocolours=1 test
 %endif
 
 %post
@@ -227,7 +233,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc Changes README COPYING Artistic pod1/publican
 %{perl_vendorlib}/Publican.pm
-%{perl_vendorlib}/Publican/*
+%{perl_vendorlib}/Publican
 %{_mandir}/man3/Publican*
 %{_mandir}/man1/*
 %{_bindir}/publican
@@ -250,8 +256,46 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Mar 19 2013 Rüdiger Landmann <rlandmann at redhat.com> 3.0.0-1
+* Wed Mar 20 2013 Rüdiger Landmann <rlandmann at redhat.com> 3.1.5-1
 - patch for XSL newlines broken in F18 and newer
+- patch for PDFs built with wkhtmltopdf built against system QT
+- patch to suppress PDF tests in Koji without X
+
+* Mon Mar 18 2013 Jeff Fearn <jfearn at redhat.com> 3.1.5-0
+- Fix translated PDS encode issue when build from packaged books.
+
+* Tue Mar 12 2013 Jeff Fearn <jfearn at redhat.com> 3.1.4-0
+- Fix entities in Book_Info braking build. BZ #917898
+- add translations of "Revision History". BZ #918365
+- Fix TOC title not translated in PDF. BZ #918365
+- Fix translated strings with parameters. BZ #891166
+- update translations
+- add it-IT translation of PUG via <fedora at marionline.it> BZ #797515
+
+* Fri Feb 22 2013 Jeff Fearn <jfearn at redhat.com> 3.1.3-1
+- Fix add_revision breaking XML parser. BZ #912985
+- Stronger fix for cover pages causing page number overrun. BZ #912967
+- Fix CSS for article front page subtile. BZ #913016
+
+* Mon Feb 18 2013 Jeff Fearn <jfearn at redhat.com> 3.1.2-0
+- Fix tests failing when publican not installed. BZ #908956
+- Fix broken mr-IN/Conventions.po. BZ #908956
+- Fix footnote link unclickable. BZ #909006
+- Fix missing translations for common files. BZ #908976
+- Fix using edition for version on cover pages. BZ #912180
+- Fix nested entities causing XML::TreeBuilder to fail. BZ #912187
+
+* Thu Feb 7 2013 Jeff Fearn <jfearn at redhat.com> 3.1.1-0
+-  Fix web site CSS for admonitions. BZ #908539
+
+* Mon Feb 4 2013 Jeff Fearn <jfearn at redhat.com> 3.1.0-2
+- Fix translated text
+
+* Mon Feb 4 2013 Jeff Fearn <jfearn at redhat.com> 3.1.0-1
+- Warn of failure to chmod/chown.
+
+* Fri Jan 25 2013 Jeff Fearn <jfearn at redhat.com> 3.1.0-0
+- new upstream package.
 
 * Wed Oct 31 2012 Jeff Fearn <jfearn at redhat.com> 3.0.0-0
 - new upstream package.
diff --git a/sources b/sources
index e5b2374..c679958 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,6 @@
 a4327409d5d1152cd6849dc6ac51e76d  Publican-v3.0.0.tar.gz
 f454d68d83bbe1cb23259e1d69a431fb  xsl-newlines.patch
+34f6057dbc14db9aa05bf2d44d83fe9e  Publican-v3.1.5.tar.gz
+b5693676c7fb12a8ce416e23e49ce43f  nopdfcover.patch
+3f392881af022770435b7eb3702f6c0b  nopdftest.patch
+3f7211863391ba6d5982a7ad13117e8e  xsl-newlines-315.patch

More information about the scm-commits mailing list