new upstream

This commit is contained in:
Ruediger Landmann 2014-05-27 16:54:17 +10:00
parent 7de6d3ba5a
commit 8900ff943c
3 changed files with 79 additions and 21 deletions

1
.gitignore vendored
View File

@ -14,3 +14,4 @@ Publican-2.1.tar.gz
/xsl-newlines-315.patch
/Publican-v3.2.1.tar.gz
/Publican-v4.0.0.tar.gz
/Publican-v4.1.3.tar.gz

View File

@ -1,21 +1,25 @@
# 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")
%define TESTS 0
%define TESTS 1
%define wwwdir /var/www/html/docs
Name: publican
Version: 4.0.0
Release: 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
@ -26,6 +30,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Provides: publican-common = %{version}
Provides: publican-common-db5 = %{version}
Provides: publican-API = 4.1
# Get rid of the old packages
Obsoletes: perl-Publican-WebSite
@ -45,7 +50,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)
@ -77,7 +82,7 @@ BuildRequires: perl(Locale::PO)
BuildRequires: perl(Module::Build)
BuildRequires: perl(Pod::Usage)
BuildRequires: perl(String::Similarity)
BuildRequires: perl(Syntax::Highlight::Engine::Kate) >= 0.07
BuildRequires: perl(Syntax::Highlight::Engine::Kate) >= 0.07-5
BuildRequires: perl(Template)
BuildRequires: perl(Template::Constants)
BuildRequires: perl(Term::ANSIColor)
@ -87,9 +92,8 @@ BuildRequires: perl(XML::LibXML) => 1.70
BuildRequires: perl(XML::LibXSLT) => 1.70
BuildRequires: perl(XML::Simple)
BuildRequires: perl(XML::TreeBuilder) => 5.1
#BuildRequires: wkhtmltopdf >= 0.10.0_rc2-5
BuildRequires: fop
BuildRequires: batik
# BZ #1053609
BuildRequires: perl-XML-TreeBuilder >= 5.1
BuildRequires: docbook-style-xsl >= 1.77.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
@ -105,19 +109,18 @@ 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
#Requires: wkhtmltopdf >= 0.10.0_rc2-5
Requires: fop
Requires: batik
Requires: perl(Locale::Maketext::Gettext) >= 1.27-1.2
Requires: rpm-build
Requires: docbook-style-xsl >= 1.77.1
Requires: perl(XML::LibXML) >= 1.67
Requires: perl(XML::LibXSLT) >= 1.67
Requires: perl(XML::TreeBuilder) >= 5.1
# BZ #1053609
Requires: perl-XML-TreeBuilder >= 5.1
Requires: perl-Template-Toolkit
Requires: perl(DBD::SQLite)
Requires: perl(Text::CSV_XS)
Requires: perl(Syntax::Highlight::Engine::Kate) >= 0.07
Requires: perl(Syntax::Highlight::Engine::Kate) >= 0.07-5
Requires: docbook5-schemas
Requires: docbook5-style-xsl >= 1.78.1
@ -140,7 +143,19 @@ 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 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
@ -149,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
@ -198,7 +214,6 @@ Website style for common brand for DocBook5 content
%prep
%setup -q -n Publican-v%{version}
%{?_docdir_fmt:%{__perl} -pi -e 's|/publican-\$VERSION|/publican|' bin/publican}
%build
%{__perl} Build.PL installdirs=vendor --nocolours=1
@ -305,11 +320,53 @@ rm -rf $RPM_BUILD_ROOT
%{wwwdir}/common-db5
%changelog
* Wed Apr 30 2014 Petr Pisar <ppisar@redhat.com> - 4.0.0-1
- Fix versions in Perl module dependencies
* Tue May 20 2014 Jeff Fearn <jfearn@redhat.com> 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 Dec 18 2013 Rüdiger Landmann <rlandmann@redhat.com> 4.0.0-0.1
- (Build)Require FOP instead of wkhtmltopdf for Fedora
* Wed May 14 2014 Jeff Fearn <jfearn@redhat.com> 4.1.2-0.1
- Fix Fedora and RHEL7 requires
* Wed May 14 2014 Jeff Fearn <jfearn@redhat.com> 4.1.2-0
- Fix broken DocBook5 validation stopping package builds. BZ #1097495
* Thu May 8 2014 Jeff Fearn <jfearn@redhat.com> 4.1.1-0
- Fix long tables and pre's breaking PDF build. BZ #1095574
* Mon May 5 2014 Jeff Fearn <jfearn@redhat.com> 4.1.0-0
- Add abstract to release notes so PDF builds
- Fix RPM upgrade not pulling in required XML::TreeBuilder version. BZ #1053609
- Allow PDF to build without any authors. BZ #1050975
- Increase XML::LibXSLT::max_depth to 10K. BZ #1035525
- Include entrytbl in cols count. BZ #1069405
- Add 'td' to translatable blocks list. BZ #1059938
- Treat entry like para for mixedmode tags. BZ #1039382
- Add blank page after cover page in PDF. BZ #1050770
- Fix replaceable override in DB 4.5 XSL. BZ #1054462
- Store processing instructions. BZ #1045463
- Add releaseinfo support. BZ #1050789
- Add suppor5t for wkhtmltopdf 0.12.0
- Add non-minified JS files. BZ #1062109
- Use term as ID node for varlistentry. BZ #1050836
- Fix acroread search and image issues. BZ #1038393 #1065810
- Add line numbering to DB5 html output. BZ #1074709
- Remove glossdiv and indexdiv headings from PDF TOC. BZ #1058545
- Add basic handling & style for revisionflag.
- Fix admonition style for wkhtmnltopdf 0.12.
- Pass chunk_section_depth to wkhtmltopdf. BZ #1044848
- Do not die on empty brand conf files. BZ #1037037
- Fix font embedding
- Enforce RPM API requirements. BZ #1029293
- Fix desktop SPEC file creation. BZ #1081087
- Pass previous option to msgmerge. BZ #1081363
- Load splash pages in templates instead of using javascript. BZ #1081300
- Sync list layout across web and desktop styles. BZ #1080236
- Add dt_format parameter. BZ #1081808
- Provide gettext version of package name. BZ #1083102
- Fix step style. BZ #1080156
- Fix DD layout. BZ #1084242
- Fix tables breaking out. BZ #1082444
- Add zt_push and zt_pull for Zanata.
* Wed Dec 18 2013 Rüdiger Landmann <rlandmann@redhat.com> 4.0.0-0
- Support DocBook 5 as input format. BZ #1005042

View File

@ -1 +1 @@
b5b9f86ff4e522185b56692a67703e5d Publican-v4.0.0.tar.gz
76e760944de2412133d96f98148781cf Publican-v4.1.3.tar.gz