new source

.gitignore

@@ -14,3 +14,8 @@ Publican-2.1.tar.gz
 /xsl-newlines-315.patch
 /Publican-v3.2.1.tar.gz
 /Publican-v4.0.0.tar.gz
+/Publican-v4.1.0.tar.gz
+/Publican-v4.1.1.tar.gz
+/Publican-v4.1.3.tar.gz
+/Publican-v4.1.6.tar.gz
+/Publican-v4.2.6.tar.gz

publican.spec

@@ -1,21 +1,28 @@
 
 # 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)
+
+# BUGBUG BZ #1144220 work around wrong entity string bug
+%define DBPATH %(find /usr/share/sgml/docbook/xml-dtd-4.5*/dbcentx.mod)
 
 %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:        0.1%{?dist}
+Version:        4.2.6
+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
@@ -24,8 +31,9 @@ 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}
+Provides:       publican-common = %{version}
+Provides:       publican-common-db5 = %{version}
+Provides:       publican-API = 4.1
 
 # Get rid of the old packages
 Obsoletes:      perl-Publican-WebSite
@@ -62,22 +70,24 @@ BuildRequires:  perl(File::Inplace)
 BuildRequires:  perl(File::Path)
 BuildRequires:  perl(File::pushd)
 BuildRequires:  perl(File::Spec)
+BuildRequires:  perl(File::Slurp)
 BuildRequires:  perl(File::Which)
 BuildRequires:  perl(Getopt::Long)
 BuildRequires:  perl(HTML::FormatText)
 BuildRequires:  perl(HTML::FormatText::WithLinks)
 BuildRequires:  perl(HTML::FormatText::WithLinks::AndTables) >= 0.02
 BuildRequires:  perl(HTML::TreeBuilder)
+BuildRequires:  perl(HTML::WikiConverter::Markdown) >= 0.06
 BuildRequires:  perl(I18N::LangTags::List)
 BuildRequires:  perl(IO::String)
 BuildRequires:  perl(List::MoreUtils)
 BuildRequires:  perl(List::Util)
 BuildRequires:  perl(Locale::Language)
-BuildRequires:  perl(Locale::PO)
+BuildRequires:  perl(Locale::PO) >= 0.24
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(Pod::Usage)
 BuildRequires:  perl(String::Similarity)
-BuildRequires:  perl(Syntax::Highlight::Engine::Kate) >= 0.07-5
+BuildRequires:  perl(Syntax::Highlight::Engine::Kate) >= 0.09
 BuildRequires:  perl(Template)
 BuildRequires:  perl(Template::Constants)
 BuildRequires:  perl(Term::ANSIColor)
@@ -86,10 +96,9 @@ BuildRequires:  perl(Time::localtime)
 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
+BuildRequires:  perl(XML::TreeBuilder) => 5.4
+# BZ #1053609
+BuildRequires:  perl-XML-TreeBuilder >= 5.4
 BuildRequires:  docbook-style-xsl >= 1.77.1
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -102,26 +111,26 @@ BuildRequires:  perl(version) >= 0.77
 BuildRequires:  perl(Locale::Msgfmt)
 BuildRequires:  perl(Locale::Maketext::Lexicon)
 BuildRequires:  perl(Lingua::EN::Fathom)
+BuildRequires:  rpm-build libicu-devel
 
 # 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:  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) >= 5.1
+Requires:       perl(XML::LibXML)  >=  1.70
+Requires:       perl(XML::LibXSLT) >=  1.70
+Requires:       perl(XML::TreeBuilder) >= 5.4
+Requires:       perl(HTML::WikiConverter::Markdown) >= 0.06
+# BZ #1053609
+Requires:       perl-XML-TreeBuilder >= 5.4
 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...
+# Not really required, but sometimes koji pulls in a conflicting dep...
 Requires:       perl(Compress::Zlib) => 2.030
 
 # Lets validate some basics
@@ -140,7 +149,21 @@ 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
+BuildRequires:  dejavu-fonts-common dejavu-serif-fonts dejavu-sans-fonts
+BuildRequires:  dejavu-sans-mono-fonts overpass-fonts dejavu-lgc-sans-mono-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 +172,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,30 +222,31 @@ 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
+sed -i -e 's,PATH,%{DBPATH},g' catalog
+XML_CATALOG_FILES=$dir/catalog %{__perl} Build.PL installdirs=vendor --nocolours=1
 
-./Build --nocolours=1
+XML_CATALOG_FILES=$dir/catalog ./Build --nocolours=1
 dir=`pwd`
 
-cd Users_Guide && %{__perl} -CDAS -I $dir/blib/lib $dir/blib/script/publican build \
+cd Users_Guide && XML_CATALOG_FILES=$dir/catalog  %{__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 \
+cd Release_Notes && XML_CATALOG_FILES=$dir/catalog %{__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
 
 %install
 rm -rf $RPM_BUILD_ROOT
+dir=`pwd`
 
-./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
+XML_CATALOG_FILES=$dir/catalog ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
 find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
@@ -240,16 +265,17 @@ desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/ap
 mkdir -p -m755 $RPM_BUILD_ROOT/%{wwwdir}/common
 dir=`pwd`
 cd datadir/Common_Content/common
-%{__perl} -CDAS -I $dir/blib/lib $dir/blib/script/publican install_brand --web --path=$RPM_BUILD_ROOT/%{wwwdir}/common
+XML_CATALOG_FILES=$dir/catalog %{__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} -CDAS -I $dir/blib/lib $dir/blib/script/publican install_brand --web --path=$RPM_BUILD_ROOT/%{wwwdir}/common-db5
+XML_CATALOG_FILES=$dir/catalog %{__perl} -CDAS -I $dir/blib/lib $dir/blib/script/publican install_brand --web --path=$RPM_BUILD_ROOT/%{wwwdir}/common-db5
 cd -
 
 %check
 %if %{TESTS}
-./Build --nocolours=1 test
+dir=`pwd`
+XML_CATALOG_FILES=$dir/catalog ./Build --nocolours=1 test
 %endif
 
 %post
@@ -259,11 +285,20 @@ CATALOG=%{_sysconfdir}/xml/catalog
 "https://fedorahosted.org/released/publican/xsl/docbook4/" \
 "file://%{_datadir}/publican/xsl/"  $CATALOG
 
+CATALOG=%{_sysconfdir}/xml/catalog
+%{_bindir}/xmlcatalog --noout --add "public" \
+"-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" \
+"file://%{DBPATH}"  $CATALOG
+
 %postun
 if [ "$1" = 0 ]; then
   CATALOG=%{_sysconfdir}/xml/catalog
   %{_bindir}/xmlcatalog --noout --del \
   "https://fedorahosted.org/released/publican/xsl/docbook4/" $CATALOG
+
+  CATALOG=%{_sysconfdir}/xml/catalog
+  %{_bindir}/xmlcatalog --noout --del \
+  "-//OASIS//ENTITIES DocBook Character Entities V4.5//EN" $CATALOG
 fi
 
 %clean
@@ -305,8 +340,115 @@ rm -rf $RPM_BUILD_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
+* Tue Oct 21 2014 Jeff Fearn <jfearn@redhat.com> 4.2.6-0
+- Fix External_Links translation not merging. BZ #1153911
+
+* Wed Oct 15 2014 Jeff Fearn <jfearn@redhat.com> 4.2.5-0
+- Fix DocBook4 epub failing for ja-JP. BZ #1152780
+
+* Tue Oct 14 2014 Jeff Fearn <jfearn@redhat.com> 4.2.4-0
+- Allow External_Links.xml to be translated. BZ #1150386
+- Change ja-JP person-name style. BZ #1150866
+
+* Tue Oct 7 2014 Jeff Fearn <jfearn@redhat.com> 4.2.3-0
+- Fix DocBook4 entity text, BZ #1143060
+- Remove extra white space from non-verbatim msgid's. BZ #1143792
+- Fix PDF build using FOP fails with "No numberLines function available." BZ #1143852
+- Add allow_network option. Defaults OFF. BZ #1144949
+- Add hacks to work around BZ #1144220
+
+* Wed Sep 17 2014 Jeff Fearn <jfearn@redhat.com> 4.2.2-2
+- Fix duplicate messages in POT files. BZ #1136133
+- Remove top level directory from drupal tar file. BZ #1139070
+- Fix PDF font selection. BZ #1139899
+
+* Mon Sep 01 2014 Jeff Fearn <jfearn@redhat.com> 4.2.1-0
+- Remove empty msgids from POT files. BZ #1135143
+- Fix highlight in callout with areaspec. BZ #1135827
+
+* Thu Aug 28 2014 Jeff Fearn <jfearn@redhat.com> 4.2.0-0
+- Add iframe video support to DocBook5 HTML5. BZ #752021
+- Stop calculating column width if no width is set. BZ #1084860
+- Simply styling of code, and admonitions in HTML5. BZ #1093498
+- Added tip formatting. BZ #1033830
+- Remove incorrect prompt. BZ #1096544
+- Add "popper" to hide program listing after 4 lines. BZ #1088051
+- Fix white space being removed from msgids when merging. BZ #1097090
+- Add code language switching. BZ #1092351
+- Fix CDATA support, bump XML::TreeBuilder dep to 5.3. BZ #1101050
+- Add --showfuzzy to build options.
+- Move PO manipulation to Locale::PO.
+- Fix inline"\n" not working in verbatim. BZ #1097091 (TODO bump Locale::PO version when released)
+- Fix images for DB4 website callouts. BZ #1112899
+- Remove newline after cdata. BZ #1110611
+- Add Markdown output. BZ #1120455
+- Bump Syntax::Highlight::Engine::Kate dep to 0.09.
+- Add external link support. BZ #1123193
+- Add 'th' to translation block list. BZ #1127462
+
+* Mon Aug 04 2014 Jeff Fearn <jfearn@redhat.com> 4.1.7-0
+- Another shot at fixing PDF index out of range error.
+
+* Tue Jul 29 2014 Jeff Fearn <jfearn@redhat.com> 4.1.6-0
+- Another shot at fixing PDF index out of range error.
+
+* Wed Jul 09 2014 Jeff Fearn <jfearn@redhat.com> 4.1.5-0
+- Add some web UI tranlstaion strings & sort formats. BZ #1117081
+- Fix formal para title CSS. BZ #1110076
+
+* Thu Jul 03 2014 Jeff Fearn <jfearn@redhat.com> 4.1.4-1
+- Expose sort functions to version index page.
+
+* Wed May 21 2014 Jeff Fearn <jfearn@redhat.com> 4.1.4-0
+- Fix headers and footers triggering index out of range in PDF Build.
+
+* Wed May 21 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 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

sources

@@ -1 +1 @@
-b5b9f86ff4e522185b56692a67703e5d  Publican-v4.0.0.tar.gz
+885e7adf54f14d313fc10bec4eea0235  Publican-v4.2.6.tar.gz