new upstream

This commit is contained in:
Ruediger Landmann 2013-09-10 08:50:14 +10:00
parent 2c1d681e00
commit 719018ded9
3 changed files with 112 additions and 21 deletions

1
.gitignore vendored
View File

@ -12,3 +12,4 @@ Publican-2.1.tar.gz
/nopdfcover.patch
/nopdftest.patch
/xsl-newlines-315.patch
/Publican-v3.2.1.tar.gz

View File

@ -21,8 +21,8 @@
%define wwwdir /var/www/html/docs
Name: publican
Version: 3.1.5
Release: 3%{?dist}
Version: 3.2.1
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
@ -31,6 +31,8 @@ URL: https://publican.fedorahosted.org
Source0: https://fedorahosted.org/released/publican/Publican-v%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
Provides: publican-common = %{version}
Provides: publican-common-db5 = %{version}
# Get rid of the old packages
Obsoletes: perl-Publican-WebSite
@ -46,8 +48,10 @@ BuildRequires: perl(Module::Build)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod) => 1.14
BuildRequires: perl(Test::Pod::Coverage) => 1.04
BuildRequires: perl(Archive::Tar)
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(Carp)
BuildRequires: perl(Config::Simple)
@ -80,7 +84,7 @@ BuildRequires: perl(Locale::PO)
BuildRequires: perl(Module::Build)
BuildRequires: perl(Pod::Usage)
BuildRequires: perl(String::Similarity)
BuildRequires: perl(Syntax::Highlight::Engine::Kate)
BuildRequires: perl(Syntax::Highlight::Engine::Kate) >= 0.07-5
BuildRequires: perl(Template)
BuildRequires: perl(Template::Constants)
BuildRequires: perl(Term::ANSIColor)
@ -89,8 +93,13 @@ BuildRequires: perl(Time::localtime)
BuildRequires: perl(XML::LibXML) => 1.67
BuildRequires: perl(XML::LibXSLT) => 1.67
BuildRequires: perl(XML::Simple)
BuildRequires: perl(XML::TreeBuilder) => 4.0
BuildRequires: perl(XML::TreeBuilder) => 4.2
%if 0%{?fedora}
BuildRequires: fop
BuildRequires: batik
%else
BuildRequires: wkhtmltopdf >= 0.10.0_rc2-5
%endif
BuildRequires: docbook-style-xsl >= 1.77.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
@ -101,7 +110,12 @@ 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) >= 1.27-1.2
%if 0%{?fedora}
Requires: fop
Requires: batik
%else
Requires: wkhtmltopdf >= 0.10.0_rc2-5
%endif
Requires: rpm-build
Requires: docbook-style-xsl >= 1.77.1
Requires: perl(XML::LibXML) >= 1.67
@ -110,6 +124,9 @@ Requires: perl(XML::TreeBuilder) >= 4.0
Requires: perl-Template-Toolkit
Requires: perl(DBD::SQLite)
Requires: perl(Text::CSV_XS)
Requires: perl(Syntax::Highlight::Engine::Kate) >= 0.07-5
# Not reall required, but sometimes koji pulls in a conflicting dep...
Requires: perl(Compress::Zlib) => 2.030
# Lets validate some basics
Requires: rpmlint
@ -142,10 +159,6 @@ BuildRequires: cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
BuildRequires: lklug-fonts baekmuk-ttf-batang-fonts
%endif
Patch0: xsl-newlines-315.patch
Patch1: nopdfcover.patch
Patch2: nopdftest.patch
%description
Publican is a DocBook publication system, not just a DocBook processing tool.
As well as ensuring your DocBook XML is valid, publican works to ensure
@ -171,11 +184,16 @@ Requires: publican
%description common-web
Website style for common brand.
%package common-db5-web
Group: Documentation
Summary: Website style for common brand for DocBook5 content
Requires: publican
%description common-db5-web
Website style for common brand for DocBook5 content
%prep
%setup -q -n Publican-v%{version}
%patch0 -p 1
%patch1 -p 1
%patch2 -p 1
%build
%{__perl} Build.PL installdirs=vendor --nocolours=1
@ -216,6 +234,10 @@ dir=`pwd`
cd datadir/Common_Content/common
%{__perl} -CA -I $dir/blib/lib $dir/blib/script/publican install_brand --web --path=$RPM_BUILD_ROOT/%{wwwdir}/%{brand}
cd -
mkdir -p -m755 $RPM_BUILD_ROOT/%{wwwdir}/common-db5
cd datadir/Common_Content/common-db5
%{__perl} -CA -I $dir/blib/lib $dir/blib/script/publican install_brand --web --path=$RPM_BUILD_ROOT/%{wwwdir}/common-db5
cd -
%check
%if %{TESTS}
@ -264,10 +286,83 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{wwwdir}/%{brand}
%files common-db5-web
%defattr(-,root,root,-)
%{wwwdir}/common-db5
%changelog
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Sep 04 2013 Jeff Fearn <jfearn@redhat.com> 3.2.1-0
- Fix empty images dir causing packaging fail. BZ #996349
- Fix draft background being in front. BZ #996361
- Fix Titles that are ulinks are incorrectly positioned. BZ #995095
- Fix Syntax Highlighting not working when Language and Module names differ. BZ #995932
- Fix missing '/' on callout image url. BZ #998736
- Add string for brand customistaion BZ #1002388
* Thu Aug 8 2013 Jeff Fearn <jfearn@redhat.com> 3.2.0-0
- Add spaces to web-spec.xsl to work around newer libxml2 eating white space in spec files BZ #982424
- Fix typos in common content BZ #952490 #974918
- Stop menu bouncing. BZ #953716
- Fix ID missing from admonitions. BZ #966494
- Support corpauthor for PDF. BZ #908666
- Fix nested block tags breaking translation flow. BZ #909728
- Fix multiple calls to update_po breaking packaging. BZ #891167
- Add website labels and translations. BZ #979885
- Add orgname to block/inline code. BZ #872955
- Fix get_keywords not using correct info file. BZ #957956
- Improve web print CSS. BZ #927513
- Fix pre border in PDF. BZ #905752
- Fix epub DOCTYPE. BZ #875129
- Fix step first child style. BZ #971221
- Fix long link word wrap in PDF. BZ #923481
- Support case-insensitive "language" attribute. BZ #919474
- Apply title style patch from Jaromir Hradilek. BZ #924518
- Expose %book_ver_list to products/versions_index.tmpl. BZ #962643
- Allow brands to ship web templates. Add site config toc_js. BZ #956935
- Add pdftool option to build for pdf tool control. BZ #953728
- Add default mapping for language to locale. BZ #844202
- Fix ID missing from translated Revision History. BZ #911462
- Add pub_dir option to override publish directory. BZ #830062
- Removed show_unknown parameter and associated code. BZ #915428
- Add img_dir parameter to override images directory. BZ #919481
- Support all DocBook conditionals. BZ #919486
- Flag spaces in product number as invalid. BZ #973895
- Standardized prompts in commands. BZ #880456
- Updated web_formats publican.cfg info BZ #839141
- Replaced 'home page' with 'product or version page' BZ #921803
- Replaced a broken link to CPAN with a working link BZ# 973461
- Remove duplicate brand files from base install. BZ #966143
- Add extras_dir parameter to override extras directory. BZ #953998
- Fix PDF ignoring cover logo. BZ #974353
- Add trans_drop action to freeze source language for translation. BZ #887707
- Fix empty pot files not being deleted. BZ #961413
- Fix long title layout on cover page in PDF. BZ #956934
- Add Mac OS X Lion installation instructions. BZ# 979229
- Add file handle limit workaround to FAQ BZ #952476
- Support CDATA tags. BZ #958343
- Fix UTF8 image names getting mangled in publish. BZ #953618
- Add wkhtmltopdf_opts parameter to pass options to wkhtmltopdf. BZ #951290
- Fix edition missing on PDF cover pages. BZ #956940
- Support XML in add_revision member. BZ #862465
- Fix duplicate footnotes in bibliography. BZ #653447
- Fix Link from footlink to footlink-ref not working in PDF. BZ #909786
- Fix TOC draft watermark in PDF. BZ #905271
- Add common-db5 sub package. BZ #958495
- Support decimals in colwidth & convert exact measures to pixels. BZ #913775
- Tweak equation formatting. BZ #804531
- Fix POT-Creation-Date format. BZ #985836
- Fix site stats report swapping languages and products.
- Fix web_dir not used for home page packages. BZ #988191
- Updated web site instructions - BZ#979224
* Fri Jul 12 2013 Rüdiger Landmann <rlandmann@redhat.com> 3.1.5-5
- more XSL changes to work around whitespace eaten by new libxml2
* Thu May 23 2013 Rüdiger Landmann <rlandmann@redhat.com> 3.1.5-4
- restore patch of XSL newlines
* Thu May 16 2013 Rüdiger Landmann <rlandmann@redhat.com> 3.1.5-3
- require FOP, not wkhtmltopdf
* Tue May 14 2013 Jon Ciesla <limburgher@gmail.com> - 3.1.5-2
- Drop desktop vendor tag.
@ -278,7 +373,7 @@ rm -rf $RPM_BUILD_ROOT
- patch to suppress PDF tests in Koji without X
* Mon Mar 18 2013 Jeff Fearn <jfearn@redhat.com> 3.1.5-0
- Fix translated PDS encode issue when build from packaged books.
- Fix translated PDF encode issue when build from packaged books. BZ #922618
* Tue Mar 12 2013 Jeff Fearn <jfearn@redhat.com> 3.1.4-0
- Fix entities in Book_Info braking build. BZ #917898

View File

@ -1,6 +1 @@
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
f703d4ff83347c55dd4d7dd0cffb7cd4 Publican-v3.2.1.tar.gz