From f6de4937a8bf010b921dd115f5bea1a3a2a480c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Landmann?= Date: Sat, 31 Oct 2009 23:33:40 +0000 Subject: [PATCH] - Add base langauge summary & descriptions to translated spec file. BZ #515573 - Fix translated package build failure. - Change tabs to spaces in generated spec files. - Fix Locale::Maketext::Gettext dep being missed on RHEL. - Fix common paths on Windows - Added docbook-style-xsl dep for version 1.75.1+ - POD fix from Mikhail Gusarov - Added processing file message to update_pot. BZ #518354 - add EPUB stub - Clean up Copyright in numerous files. - Add security callback for exslt:document. - Update XML::LibXML & XML::LibXSLT minimum versions to 1.67 - Fix rounded corners in HTML. BZ #509768 - Fix nested images breakin in PDF. BZ #491782 - Remove border from HTML table for simplelist. BZ #502126 - Fix remarks not being highlighted in PDF. BZ #509307 - Resize shade.verbatim font size. BZ #497462 - Change step page size limitation to para size limitation. BZ#492984 - Add warning message for missing images. BZ #495821 - Fix fuzzy images. BZ #479794 - swap from paths from Publican to publican and obsolete beta packages. - Fix large example PDF issue. BZ #531685 --- .cvsignore | 2 +- import.log | 1 + publican.spec | 307 ++++++++++++++++++++++++++++++++------------------ sources | 2 +- 4 files changed, 201 insertions(+), 111 deletions(-) create mode 100644 import.log diff --git a/.cvsignore b/.cvsignore index 9cedf08..42c4d6d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -publican-0.44.tgz +Publican-1.0.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..ae4380b --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +publican-1_0-0_fc11:HEAD:publican-1.0-0.fc11.src.rpm:1257031816 diff --git a/publican.spec b/publican.spec index 8c4fb92..335f954 100644 --- a/publican.spec +++ b/publican.spec @@ -1,49 +1,124 @@ -%define my_vendor fedora -%define EMBED_DOCKBOOK45 0 -%define HTMLVIEW 0 -%define PREMOLESTATION 0 -%define FC10 0 -%define FC11 1 -Name: publican -Summary: Common files and scripts for publishing with DocBook XML -Version: 0.44 -Release: 2%{?dist} -License: GPLv2+ and GFDL -# The following directories are licensed under the GFDL: -# content, Book_Template, Set_Template, Article_Template -Group: Applications/Text -Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Buildarch: noarch -Source: https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz -Requires: gettext libxslt docbook-dtds docbook-style-xsl elinks aspell -Requires: %{_bindir}/xml2pot %{_bindir}/po2xml -Requires: perl-ParseLex perl-HTML-Template make -Requires: fop batik saxon ImageMagick -Requires: xerces-j2 rpm-build -Requires: perl-XML-TreeBuilder >= 3.09-11 +# Track font name changes +%define RHEL5 %(test "%{?dist}" == ".el5" && echo 1 || echo 0) +%define FC10 %(test "%{?dist}" == ".fc10" && echo 1 || echo 0) +# Assume not rhel and not FC10 means FC11+ +%define OTHER %(test "%{RHEL5}" == "0" -a "%{FC10}" == "0" && echo 1 || echo 0) -BuildRequires: gettext libxslt docbook-dtds docbook-style-xsl aspell -BuildRequires: %{_bindir}/xml2pot %{_bindir}/po2xml -BuildRequires: desktop-file-utils -BuildRequires: perl-XML-TreeBuilder >= 3.09-11 -BuildRequires: fop saxon ImageMagick +# who doesn't have xdg-open? +%define HTMLVIEW %(test "%{RHEL5}" == "1" && echo 1 || echo 0) -Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts -Requires: cjkuni-uming-fonts -Requires: sazanami-gothic-fonts sazanami-mincho-fonts -Requires: lklug-fonts -Requires: baekmuk-ttf-batang-fonts +# required for desktop file install +%define my_vendor %(test "%{RHEL5}" == "1" && echo "redhat" || echo "fedora") -BuildRequires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts -BuildRequires: cjkuni-uming-fonts -BuildRequires: sazanami-gothic-fonts sazanami-mincho-fonts -BuildRequires: lklug-fonts -BuildRequires: baekmuk-ttf-batang-fonts +# TODO after beta revert to lower case name +Name: publican +Version: 1.0 +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 +Group: Applications/Publishing +URL: https://publican.fedorahosted.org +Source0: https://fedorahosted.org/releases/publican/Publican-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +BuildArch: noarch -URL: https://fedorahosted.org/publican -Obsoletes: documentation-devel < 0.26-3 -Obsoletes: perl-SGML-Translate <= 0.37-3 +BuildRequires: perl(Devel::Cover) +BuildRequires: perl(Module::Build) +BuildRequires: perl(Test::Exception) +BuildRequires: perl(Test::More) +BuildRequires: perl(Test::Pod::Coverage) +BuildRequires: perl(Test::Perl::Critic) +BuildRequires: perl(Archive::Tar) +BuildRequires: perl(Carp) +BuildRequires: perl(Config::Simple) +BuildRequires: perl(Cwd) +BuildRequires: perl(Data::Dumper) +BuildRequires: perl(DateTime) +BuildRequires: perl(DateTime::Format::DateParse) +BuildRequires: perl(Encode) +BuildRequires: perl(File::Copy::Recursive) +BuildRequires: perl(File::Find) +BuildRequires: perl(File::Find::Rule) +BuildRequires: perl(File::Path) +BuildRequires: perl(File::pushd) +BuildRequires: perl(HTML::FormatText) +BuildRequires: perl(HTML::TreeBuilder) +BuildRequires: perl(I18N::LangTags::List) +BuildRequires: perl(Image::Magick) +BuildRequires: perl(Image::Size) +BuildRequires: perl(Locale::Maketext::Gettext) +BuildRequires: perl(Locale::Language) +BuildRequires: perl(Locale::PO) +BuildRequires: perl(Makefile::Parser) +BuildRequires: perl(Syntax::Highlight::Engine::Kate) +BuildRequires: perl(Term::ANSIColor) +BuildRequires: perl(Text::Wrap) +BuildRequires: perl(version) +BuildRequires: perl(XML::LibXML) >= 1.67 +BuildRequires: perl(XML::LibXSLT) >= 1.67 +BuildRequires: perl(XML::TreeBuilder) >= 3.09-15 +BuildRequires: fop >= 0.90 +BuildRequires: batik +BuildRequires: docbook-style-xsl >= 1.75.1 +BuildRequires: desktop-file-utils + +# Most of these are handled automatically +Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) +Requires: perl(Locale::Maketext::Gettext) +Requires: fop >= 0.90 +Requires: batik +Requires: docbook-style-xsl >= 1.75.1 +Requires: perl(XML::LibXML) >= 1.67 +Requires: perl(XML::LibXSLT) >= 1.67 +Requires: perl(XML::TreeBuilder) >= 3.09-15 + +# Pull in the fonts for all languages, else you can't build translated PDF in brew/koji +%if %{RHEL5} +Requires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati +Requires: fonts-hindi fonts-japanese fonts-kannada fonts-korean +Requires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala +Requires: fonts-tamil fonts-telugu liberation-fonts +BuildRequires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati +BuildRequires: fonts-hindi fonts-japanese fonts-kannada fonts-korean +BuildRequires: fonts-malayalam fonts-oriya fonts-punjabi fonts-sinhala +BuildRequires: fonts-tamil fonts-telugu liberation-fonts +%endif +%if %{FC10} +Requires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati +Requires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada +Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts +Requires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang + +BuildRequires: lohit-fonts-bengali cjkunifonts-uming lohit-fonts-gujarati +BuildRequires: lohit-fonts-hindi sazanami-fonts-gothic sazanami-fonts-mincho lohit-fonts-kannada +BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi lklug-fonts +BuildRequires: lohit-fonts-tamil lohit-fonts-telugu liberation-fonts baekmuk-ttf-fonts-batang +%endif +%if %{OTHER} +Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts +Requires: cjkuni-uming-fonts sazanami-gothic-fonts sazanami-mincho-fonts +Requires: lklug-fonts baekmuk-ttf-batang-fonts + +BuildRequires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts +BuildRequires: cjkuni-uming-fonts sazanami-gothic-fonts sazanami-mincho-fonts +BuildRequires: lklug-fonts baekmuk-ttf-batang-fonts +# Indic font names have changed AGAIN (F12) +# and AGAIN they fail to set Provides +# but they don't work for PDFs anyway +# So we aren't going to use them +#Requires: lohit-fonts-bengali lohit-fonts-gujarati +#Requires: lohit-fonts-hindi lohit-fonts-kannada +#Requires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi +#Requires: lohit-fonts-tamil lohit-fonts-telugu +#BuildRequires: lohit-fonts-bengali lohit-fonts-gujarati +#BuildRequires: lohit-fonts-hindi lohit-fonts-kannada +#BuildRequires: lohit-fonts-malayalam lohit-fonts-oriya lohit-fonts-punjabi +#BuildRequires: lohit-fonts-tamil lohit-fonts-telugu +%endif + +Obsoletes: Publican < 1.0 %description Publican is a DocBook publication system, not just a DocBook processing tool. @@ -51,13 +126,14 @@ As well as ensuring your DocBook XML is valid, publican works to ensure your XML is up to publishable standard. %package doc -Group: Documentation -Summary: Documentation for the Publican package +Group: Documentation +Summary: Documentation for the Publican package %if %{HTMLVIEW} -Requires: htmlview +Requires: htmlview %else -Requires: xdg-utils +Requires: xdg-utils %endif +Obsoletes: Publican-doc < 1.0 %description doc Publican is a tool for publishing material authored in DocBook XML. @@ -66,34 +142,23 @@ using publican. It is not a DocBook XML tutorial and concentrates solely on using the publican tools. %prep -%setup -q +%setup -q -n Publican-%{version} %build -%{__make} OS_VER=%{?dist} docs +%{__perl} Build.PL installdirs=vendor +./Build +dir=`pwd` && cd Users_Guide && perl -I $dir/blib/lib $dir/blib/script/publican build \ + --formats=html-desktop --publish --langs=all \ + --common_config="$dir/blib/datadir" \ + --common_content="$dir/blib/datadir/Common_Content" %install rm -rf $RPM_BUILD_ROOT -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates -mkdir -p -m755 $RPM_BUILD_ROOT%{_datadir}/applications -mkdir -p -m755 $RPM_BUILD_ROOT%{_bindir} -install -m 755 bin/* $RPM_BUILD_ROOT%{_bindir} -%if %{EMBED_DOCKBOOK45} -%{__perl} -p -i -e 's|^#CATALOGS_OVERRIDE$|CATALOGS\t= XML_CATALOG_FILES="%{_datadir}/%{name}/xsl/docbook/dtd-4.5/catalog.xml %{_datadir}/%{name}/xsl/docbook/1.72.0/catalog.xml"|g' make/Makefile.templates -%endif +./Build install destdir=$RPM_BUILD_ROOT create_packlist=0 +find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \; -for i in fop make xsl Common_Content templates maven; do - cp -rf $i $RPM_BUILD_ROOT%{_datadir}/%{name}/$i -done -cp -rf Book_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Book_Template -cp -rf Set_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Set_Template -cp -rf Article_Template $RPM_BUILD_ROOT%{_datadir}/%{name}/Templates/common-Article_Template - -%if %{EMBED_DOCKBOOK45} -cp -rf xsl_extras/docbook $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/. -%endif - -cp xsl_extras/docbook/1.72.0/extensions/saxon65.jar $RPM_BUILD_ROOT%{_datadir}/%{name}/xsl/. +%{_fixperms} $RPM_BUILD_ROOT/* 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 @@ -104,38 +169,61 @@ sed -i -e 's|xdg-open|htmlview|' %{name}.desktop desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop +%check +#./Build test + %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc README -%doc COPYING -%doc fdl.txt -%{_datadir}/%{name} -%{_bindir}/create_book -%{_bindir}/mkxpot -%{_bindir}/msgxmerge -%{_bindir}/po2xlf -%{_bindir}/po2sgml -%{_bindir}/potmerge -%{_bindir}/poxmerge -%{_bindir}/rmImages -%{_bindir}/StSe_Reports -%{_bindir}/xlf2pot -%{_bindir}/xmlClean +%doc Changes README COPYING Artistic +%{perl_vendorlib}/* +%{_mandir}/man3/* +%{_mandir}/man1/* +%{_bindir}/publican +%{_datadir}/publican %files doc -%doc docs/* +%defattr(-,root,root,-) +%doc Users_Guide/publish/* %{_datadir}/applications/%{my_vendor}-%{name}.desktop %doc fdl.txt %changelog -* Fri Sep 21 2009 Jeff Fearn 0.44-2 -- remove lohit font deps, they don't work for PDFs generated in FOP +* Mon Oct 26 2009 Jeff Fearn 1.0-0 +- Add base langauge summary & descriptions to translated spec file. BZ #515573 +- Fix translated package build failure. +- Change tabs to spaces in generated spec files. +- Fix Locale::Maketext::Gettext dep being missed on RHEL. +- Fix common paths on Windows +- Added docbook-style-xsl dep for version 1.75.1+ +- POD fix from Mikhail Gusarov +- Added processing file message to update_pot. BZ #518354 +- add EPUB stub +- Clean up Copyright in numerous files. +- Add security callback for exslt:document. +- Update XML::LibXML & XML::LibXSLT minimum versions to 1.67 +- Fix rounded corners in HTML. BZ #509768 +- Fix nested images breakin in PDF. BZ #491782 +- Remove border from HTML table for simplelist. BZ #502126 +- Fix remarks not being highlighted in PDF. BZ #509307 +- Resize shade.verbatim font size. BZ #497462 +- Change step page size limitation to para size limitation. BZ#492984 +- Add warning message for missing images. BZ #495821 +- Fix fuzzy images. BZ #479794 +- swap from paths from Publican to publican and obsolete beta packages. +- Fix large example PDF issue. BZ #531685 -* Sun Jul 26 2009 Fedora Release Engineering - 0.44-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild +* Sat Jul 18 2009 Jeff Fearn 0.99-0.ALPHA1 +- Rebase to Perl rewrite. + +* Wed Mar 25 2009 Jeff Fearn 0.45 +- Add keep-together.within-column="always" to step. BZ #492021 +- Fix right to left fo ar-AR. BZ #486162 +- Patches and translations by Muayyad Alsadi +- Added missing doccomment and number to PDF highlight. BZ #491241 +- Fix files dir missing from RPMs. BZ #492034 * Wed Mar 11 2009 Jeff Fearn 0.44 - Add 0-9 and '.' to DOCNAME regex. BZ #489626 @@ -487,10 +575,10 @@ rm -rf $RPM_BUILD_ROOT - Added build message when copying Product Specific common files - Move local entity to first position so it overrides common entity files - Added missing DocBook tags to xmlClean: -- accel blockquote classname code colophon envar example footnote -- guisubmenu interface keycap keycombo literal literallayout option -- parameter prompt property see seealso substeps systemitem wordasword -- glossary glossdiv glosssee glossseealso +- accel blockquote classname code colophon envar example footnote +- guisubmenu interface keycap keycombo literal literallayout option +- parameter prompt property see seealso substeps systemitem wordasword +- glossary glossdiv glosssee glossseealso - Moved executables in to bin directory. - Fixed layout of formal para titles in PDF - Removed trunctaion and elipses from title used for page headers @@ -576,23 +664,23 @@ rm -rf $RPM_BUILD_ROOT - add DocBook 1.72.0 xsl to package - modify makefiles to use new DocBook catalogs - xmlClean: -- Changed DTD from 4.3 to 4.5 -- Added bookname to node id's to help avoid id clashes in sets -- Fixed line wrap issue in PDF generation for zh-CN and zh-TW -- Enforced validation of xml on all build targets -- Add legalnotice tag -- Add address tag -- Add street tag -- Add city tag -- Add state tag -- Add postcode tag -- Add country tag -- Add phone tag -- Add fax tag -- Add pob tag -- Add preface tag -- Add bibliograpy related tags -- Add qandaset related tags +- Changed DTD from 4.3 to 4.5 +- Added bookname to node id's to help avoid id clashes in sets +- Fixed line wrap issue in PDF generation for zh-CN and zh-TW +- Enforced validation of xml on all build targets +- Add legalnotice tag +- Add address tag +- Add street tag +- Add city tag +- Add state tag +- Add postcode tag +- Add country tag +- Add phone tag +- Add fax tag +- Add pob tag +- Add preface tag +- Add bibliograpy related tags +- Add qandaset related tags - Removed Confidential image and restyle confidential html text - Added po2xlf script - Added xlf2po script @@ -617,9 +705,9 @@ rm -rf $RPM_BUILD_ROOT - fix image dimensions on content/common/en-US/images/redhat-logo.svg - remove leading space from rpm spec desription - Made abstract wrap at 72 characters and be left aligned. -- it's used for the spec description +- it's used for the spec description - Move legal notice link param from xhtml.xsl to main-html so nochunks -- target will have legal notice embedded in page +- target will have legal notice embedded in page * Tue Apr 24 2007 Jeff Fearn 0.9.1 - fix path to xsl @@ -709,3 +797,4 @@ rm -rf $RPM_BUILD_ROOT * Wed Feb 07 2007 Jeff Fearn 0.0 - Initial creation + diff --git a/sources b/sources index 05e99d0..6259ac6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -720fcfd8903fe370a69107350e2afa22 publican-0.44.tgz +1c0b735fd5ba7fe7487d0e88ae894f01 Publican-1.0.tar.gz