diff --git a/.gitignore b/.gitignore index 6eaf80a..8252e64 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ Publican-2.1.tar.gz /Publican-v3.2.1.tar.gz /Publican-v4.1.0.tar.gz /Publican-v4.1.1.tar.gz +/Publican-v4.1.3.tar.gz diff --git a/publican.spec b/publican.spec index 2a1c113..a46ce80 100644 --- a/publican.spec +++ b/publican.spec @@ -1,11 +1,15 @@ # Track font name changes %define RHEL6 %([[ %{?dist}x == .el6[a-z]* ]] && echo 1 || echo 0) +%define RHEL7 %([[ %{?dist}x == .el7[a-z]* ]] && echo 1 || echo 0) %define OTHER 1 %if %{RHEL6} %define OTHER 0 %endif +%if %{RHEL7} +%define OTHER 0 +%endif # required for desktop file install %define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat") @@ -14,8 +18,8 @@ %define wwwdir /var/www/html/docs Name: publican -Version: 4.1.1 -Release: 0.1%{?dist} +Version: 4.1.3 +Release: 0%{?dist} Summary: Common files and scripts for publishing with DocBook XML # For a breakdown of the licensing, refer to LICENSE License: (GPLv2+ or Artistic) and CC0 @@ -90,7 +94,6 @@ BuildRequires: perl(XML::Simple) BuildRequires: perl(XML::TreeBuilder) => 5.1 # BZ #1053609 BuildRequires: perl-XML-TreeBuilder >= 5.1 -BuildRequires: fop BuildRequires: docbook-style-xsl >= 1.77.1 BuildRequires: desktop-file-utils BuildRequires: gettext @@ -107,7 +110,6 @@ BuildRequires: perl(Lingua::EN::Fathom) # 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: fop Requires: rpm-build Requires: docbook-style-xsl >= 1.77.1 Requires: perl(XML::LibXML) >= 1.67 @@ -142,7 +144,18 @@ 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 overpass-fonts Requires: wqy-zenhei-fonts - +Requires: wkhtmltopdf >= 0.12.1.devlopment +BuildRequires: wkhtmltopdf >= 0.12.1.development +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 +%if %{RHEL7} +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 overpass-fonts +Requires: wkhtmltopdf >= 0.12.1.devlopment +BuildRequires: wkhtmltopdf >= 0.12.1.development 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 @@ -151,7 +164,8 @@ BuildRequires: lklug-fonts baekmuk-ttf-batang-fonts 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 overpass-fonts - +Requires: fop +BuildRequires: fop 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 @@ -306,8 +320,15 @@ rm -rf $RPM_BUILD_ROOT %{wwwdir}/common-db5 %changelog -* Fri May 9 2014 RĂ¼diger Landmann 4.1.1-0.1 -- Depend on FOP +* Tue May 20 2014 Jeff Fearn 4.1.3-0 +- Fix extra space breaking spec files with sort_order. BZ #1099262 +- Make div.title bold in db4.css. BZ #1049661 + +* Wed May 14 2014 Jeff Fearn 4.1.2-0.1 +- Fix Fedora and RHEL7 requires + +* Wed May 14 2014 Jeff Fearn 4.1.2-0 +- Fix broken DocBook5 validation stopping package builds. BZ #1097495 * Thu May 8 2014 Jeff Fearn 4.1.1-0 - Fix long tables and pre's breaking PDF build. BZ #1095574 diff --git a/sources b/sources index aa40fcf..4035a06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -babee7c7e49d527d334d7068c596246e Publican-v4.1.1.tar.gz +76e760944de2412133d96f98148781cf Publican-v4.1.3.tar.gz