Update to new major version

This commit is contained in:
Ruediger Landmann 2014-02-03 08:49:09 +10:00
parent 719018ded9
commit b722e54d18
3 changed files with 130 additions and 65 deletions

1
.gitignore vendored
View File

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

View File

@ -10,19 +10,12 @@
# required for desktop file install
%define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat")
%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
%global with_desktop_vendor_tag 1
%else
%global with_desktop_vendor_tag 0
%endif
%define TESTS 1
%define brand common
%define TESTS 0
%define wwwdir /var/www/html/docs
Name: publican
Version: 3.2.1
Release: 0%{?dist}
Version: 4.0.0
Release: 0.1%{?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,41 +83,44 @@ BuildRequires: perl(Template::Constants)
BuildRequires: perl(Term::ANSIColor)
BuildRequires: perl(Text::Wrap)
BuildRequires: perl(Time::localtime)
BuildRequires: perl(XML::LibXML) => 1.67
BuildRequires: perl(XML::LibXSLT) => 1.67
BuildRequires: perl(XML::LibXML) => 1.70
BuildRequires: perl(XML::LibXSLT) => 1.70
BuildRequires: perl(XML::Simple)
BuildRequires: perl(XML::TreeBuilder) => 4.2
%if 0%{?fedora}
BuildRequires: perl(XML::TreeBuilder) => 5.1
#BuildRequires: wkhtmltopdf >= 0.10.0_rc2-5
BuildRequires: fop
BuildRequires: batik
%else
BuildRequires: wkhtmltopdf >= 0.10.0_rc2-5
%endif
BuildRequires: batik
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)
BuildRequires: docbook5-schemas
BuildRequires: docbook5-style-xsl >= 1.78.1
BuildRequires: perl(version) >= 0.77
BuildRequires: perl(Locale::Msgfmt)
BuildRequires: perl(Locale::Maketext::Lexicon)
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
%if 0%{?fedora}
Requires: fop
Requires: batik
%else
Requires: wkhtmltopdf >= 0.10.0_rc2-5
%endif
#Requires: wkhtmltopdf >= 0.10.0_rc2-5
Requires: fop
Requires: batik
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) >= 4.0
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-5
Requires: docbook5-schemas
Requires: docbook5-style-xsl >= 1.78.1
# Not reall required, but sometimes koji pulls in a conflicting dep...
Requires: perl(Compress::Zlib) => 2.030
@ -176,6 +172,14 @@ This guide explains how to to create and build books and articles
using publican. It is not a DocBook XML tutorial and concentrates
solely on using the publican tools.
%package releasenotes
Group: Documentation
Summary: Release notes for the Publican package
Requires: xdg-utils
%description releasenotes
Release notes for Publican %{version}.
%package common-web
Group: Documentation
Summary: Website style for common brand
@ -197,9 +201,19 @@ Website style for common brand for DocBook5 content
%build
%{__perl} Build.PL installdirs=vendor --nocolours=1
./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 \
dir=`pwd`
cd Users_Guide && %{__perl} -CDAS -I $dir/blib/lib $dir/blib/script/publican build \
--formats=html-desktop --publish --langs=en-US \
--common_config="$dir/blib/datadir" \
--common_content="$dir/blib/datadir/Common_Content" --nocolours
cd $dir
cd Release_Notes && %{__perl} -CDAS -I $dir/blib/lib $dir/blib/script/publican build \
--formats=html-desktop --publish --langs=en-US \
--common_config="$dir/blib/datadir" \
--common_content="$dir/blib/datadir/Common_Content" --nocolours
@ -213,30 +227,23 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
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
desktop-file-install \
%if 0%{?with_desktop_vendor_tag}
--vendor="%{my_vendor}" \
%endif
--dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.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
for file in po/*.po; do
lang=`echo "$file" | sed -e 's/po\/\(.*\)\.po/\1/'`;
mkdir -p $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES;
msgfmt $file -o $RPM_BUILD_ROOT%{_datadir}/locale/$lang/LC_MESSAGES/%{name}.mo;
done
%find_lang %{name}
%find_lang %{name} --with-man
# Package web common files
mkdir -p -m755 $RPM_BUILD_ROOT/%{wwwdir}/%{brand}
mkdir -p -m755 $RPM_BUILD_ROOT/%{wwwdir}/common
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}
%{__perl} -CDAS -I $dir/blib/lib $dir/blib/script/publican install_brand --web --path=$RPM_BUILD_ROOT/%{wwwdir}/common
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
%{__perl} -CDAS -I $dir/blib/lib $dir/blib/script/publican install_brand --web --path=$RPM_BUILD_ROOT/%{wwwdir}/common-db5
cd -
%check
@ -248,14 +255,14 @@ cd -
# hack to allow branch directory BZ #800252
CATALOG=%{_sysconfdir}/xml/catalog
%{_bindir}/xmlcatalog --noout --add "rewriteURI" \
"https://fedorahosted.org/released/publican/xsl/docbook4/" \
"file://%{_datadir}/publican/xsl/" $CATALOG
"https://fedorahosted.org/released/publican/xsl/docbook4/" \
"file://%{_datadir}/publican/xsl/" $CATALOG
%postun
if [ "$1" = 0 ]; then
CATALOG=%{_sysconfdir}/xml/catalog
%{_bindir}/xmlcatalog --noout --del \
"file://%{_datadir}/publican/xsl/docbook4/" $CATALOG
"https://fedorahosted.org/released/publican/xsl/docbook4/" $CATALOG
fi
%clean
@ -279,18 +286,92 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(-,root,root,-)
%doc Users_Guide/publish/desktop/*
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/applications/%{my_vendor}-%{name}.desktop
%doc fdl.txt
%files releasenotes
%defattr(-,root,root,-)
%doc Release_Notes/publish/desktop/*
%{_datadir}/applications/%{my_vendor}-%{name}-releasenotes.desktop
%doc fdl.txt
%files common-web
%defattr(-,root,root,-)
%{wwwdir}/%{brand}
%{wwwdir}/common
%files common-db5-web
%defattr(-,root,root,-)
%{wwwdir}/common-db5
%changelog
* Wed Dec 18 2013 Rüdiger Landmann <rlandmann@redhat.com> 4.0.0-0.1
- (Build)Require FOP instead of wkhtmltopdf for Fedora
* Wed Dec 18 2013 Rüdiger Landmann <rlandmann@redhat.com> 4.0.0-0
- Support DocBook 5 as input format. BZ #1005042
- Fix duplicate first author in PDF. BZ #996351
- Include DocBook 5-compatible templates. BZ #697366
- Fix UTF8 issue in ~/.publican.cfg. BZ #987325
- Replace abstract and subtitle xsl. BZ #953675
- Change Cover page font. BZ #1006134
- Fix TOC leader in PDF. BZ #1006056
- Fix PDF Legal Notice trademarks & formatting. BZ #970851
- Fix keyword lable showing in PDF when there are no keywords. BZ #1007146
- Indicate whether a translation is older in the web GUI. BZ #889031
- Include time in update_date. BZ #979846
- Support web site navigation for books without HTML. BZ #885916
- Support ascending Revision History. BZ #999578
- Add ability to compy installed brand web content to another site. BZ #967664
- Fix PDF example.properties template. BZ #999586
- Fix PUG PDF format for OpenSuse. BZ #999581
- Simplify highlight error message. BZ #987059
- Add css styles for table sizes. BZ #1005640
- Tidy up Build.PL for better CPAN support. BZ #999259
- Fix image path for icon.svg. BZ #1011222
- Fix print_unused not handling include from higher directories. BZ #1004955
- Fix SVG fallback to PNG. BZ #990823
- Fix subtitle font size. BZ #987431
- Support grouping of books within a version. BZ #901560
- Remove bold from titles in Indic scripts. BZ #1006135
- Overhaul EPUB, basic CSS, harcode chunking, fix errors. BZ #883159
- Fix duplicate file listing in EPUB. BZ #875119
- Fix objects in EPUB not in catalog. BZ #875125
- Fix duplicate ID's in EPUBs. BZ #875116
- Fix ConfigData not being reset after testing on all platforms. BZ #999427
- Fix links to step not functioning. BZ #1009015
- Support GIT for distributed sets. BZ #864226
- Fix Build.PL not handling .mo files. BZ #1016421
- Bold and Center titlepage edition. BZ #1017548
- Fix broken use of pushd in Build.PL. BZ #1018608
- Remove XML from spec file abstract. BZ #1018796
- Fix UTF8 in publican.cfg not being handled. BZ #1020059
- Fix Indic PDF build on F19. BZ #1018024
- Fix UTF8 encoding for title in Revision_History.xml BZ #1020570
- Fix browser not detecting UTF8 on HTML5 files with .html extension. BZ #1018659
- Fix styling of DB4 example, package, & option. Remove html.longdesc.embed xsl. BZ #1023248
- Fix UTF8 in Groups.xml. BZ #1022575
- Add translations for "Edition" BZ# 1007141
- Add translations for "English is newer" BZ #889031
- Fix broken or-IN translation.
- Update DB4 CSS steps, stepalts, OLs, term. BZ #1026173
- Remove chunk override from html.xsl. BZ #1026563
- Fix path to POD. BZ #1026563
- Update CLI translations
- Various fixes to Common Content + update Common Content translation. BZ #1027248
- Update and correct Debian installation instructions. BZ #1013934
- Correct OpenSUSE installation instructions. BZ #1000534
- Add Docker installation instructions. BZ #1015943
- Clarify where relative paths are used in brand instructions - BZ #1028815
- Update and clarify translation instructions BZ #1021287
- Expose glossterm in PO files to support sortas attribute. BZ #1030591
- Add report action to print readability statistics. BZ #1031364
- Change comment in syntax highlight to light grey. BZ #1030718
- Document use of "sortas" for indexes and glossaries in PUG
- Fix newline in translation affecting output. BZ #1036150
* Fri Oct 4 2013 Jeff Fearn <jfearn@redhat.com> 3.9.9-0
- Publican 4.0 RC1
* 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
@ -355,23 +436,6 @@ rm -rf $RPM_BUILD_ROOT
- 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.
* Wed Mar 20 2013 Rüdiger Landmann <rlandmann@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@redhat.com> 3.1.5-0
- Fix translated PDF encode issue when build from packaged books. BZ #922618

View File

@ -1 +1 @@
f703d4ff83347c55dd4d7dd0cffb7cd4 Publican-v3.2.1.tar.gz
b5b9f86ff4e522185b56692a67703e5d Publican-v4.0.0.tar.gz