From 5b39ffed8e4f8c295a2effb9876ff93249caf597 Mon Sep 17 00:00:00 2001 From: Jeff Fearn Date: Fri, 25 Jul 2008 05:56:37 +0000 Subject: [PATCH] new version --- .cvsignore | 1 + publican.spec | 121 +++++++++++++++++++++++++++++++++++++++++++++----- sources | 2 +- 3 files changed, 112 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index 4077290..711fd2c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ publican-0.30.tgz publican-0.32.tgz publican-0.33.tgz +publican-0.34.tgz diff --git a/publican.spec b/publican.spec index 1b4d811..c51f698 100644 --- a/publican.spec +++ b/publican.spec @@ -1,9 +1,12 @@ %define my_vendor fedora +%define EMBED_DOCKBOOK45 0 +%define HTMLVIEW 0 +%define PREMOLESTATION 0 Name: publican Summary: Common files and scripts for publishing Documentation -Version: 0.33 -Release: 2%{?dist} +Version: 0.34 +Release: 0%{?dist} License: GPLv2+ and GFDL # The following directories are licensed under the GFDL: # content @@ -11,15 +14,46 @@ License: GPLv2+ and GFDL Group: Applications/Text Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Buildarch: noarch -Source: http://svn.fedorahosted.org/svn/publican/trunk/Files/%{name}-%{version}.tgz +Source: https://fedorahosted.org/releases/p/u/publican/%{name}-%{version}.tgz # need kdesdk for po2xml & xml2pot -Requires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl dejavu-lgc-fonts elinks +Requires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl elinks aspell Requires: %{_bindir}/xml2pot %{_bindir}/po2xml -BuildRequires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl -BuildRequires: desktop-file-utils +Requires: perl-ParseLex perl-HTML-Template make +Requires: fop batik saxon ImageMagick +#Requires: xslthl + +BuildRequires: gettext libxslt perl(XML::TreeBuilder) docbook-style-xsl aspell BuildRequires: %{_bindir}/xml2pot %{_bindir}/po2xml +BuildRequires: desktop-file-utils +# FOP is required to build the mont metrics. +BuildRequires: fop saxon +#BuildRequires: xslthl +# *&%^*&^ decided to rename font packages and change font paths. +# No actual real changes. +%if %{PREMOLESTATION} +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 +%else +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 fonts-korean + +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 fonts-korean +%endif + URL: https://fedorahosted.org/publican -Obsoletes: documentation-devel < 0.26-3 +Obsoletes: documentation-devel < 0.26-3 Obsoletes: perl-SGML-Translate <= 0.37-3 %description @@ -28,7 +62,11 @@ Common files and scripts for publishing documentation. %package doc Group: Documentation Summary: Documentation for the Publican package +%if %{HTMLVIEW} +Requires: htmlview +%else Requires: xdg-utils +%endif %description doc Documentation for the Publican publishing tool chain. @@ -38,6 +76,7 @@ Documentation for the Publican publishing tool chain. %build %{__make} docs +./fop-fonts --dist=%{?dist} %install rm -rf $RPM_BUILD_ROOT @@ -45,13 +84,31 @@ 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 + for i in fop make xsl Common_Content templates; 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/. 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 + +%if %{HTMLVIEW} +sed -i -e 's|xdg-open|htmlview|' %{name}.desktop +%endif + desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop %clean @@ -84,11 +141,51 @@ rm -rf $RPM_BUILD_ROOT %doc fdl.txt %changelog -* Tue Jul 15 2008 Jeff Fearn 0.33-2 -- Rebuild +* Fri Apr 11 2008 Jeff Fearn 0.34-0 +- Fix PO file name missing from translation status report +- Modify xmlClean to output dummy content for empty files (beta) +- Default SHOW_UNKNOWN tags off +- Make unset entity warnings more obvious +- Make docs use DESKTOP styles +- Fix missing list image in html-single articles +- Commented out debug output in chunking xsl +- QANDA set html and css fix BZ #442674 +- Fix kde requires. BZ #443024 +- Add default FOP xconf file. +- Added help_internals target. +- Added check for banned tags. +- Added --lang to create_book BZ #444851 +- Added package tag BZ #444908 +- Added ability to ship $lang/files directories with html/xml payloads BZ #444935 +- Hardcoded PDF footnote colour to black BZ #446011 +- Set segmentedlist.as.table to 1. BZ #445628 +- Force monospace on command +- Switched to FOP 0.95Beta +- Fixed crash bug on files names with parentheses BZ #447659 +- Fix loose directory name matching when exluding directiories. +- Added GENERATE_SECTION_TOC_LEVEL to allow section level TOC control. BZ #449720 +- Banned inlinegraphic. BZ #448331 +- Added Article and Set Templates +- Banned xreflabel and endterm. BZ #452051 +- Generate FOP config file and font-metricfiles as build. BZ #451913 +- Changed HTML and PDF common brand to more pleasing colors. BZ #442675 +- Fixed incorrect PDF colours on Fedora and Common brands. BZ #442988 +- Fixed PDF TOC missing Chapter numbers on Sections. BZ #452802 +- Fixed spaces being removed between inline tags. BZ #453067 +- Changed TOC layout (bold chapters + spacing). BZ #453885 +- Changed title spacing, unbolded figure/table titles. +- Fix over size images breaking PDF and HTML layouts +- Add missing make Requires. BZ #454376 +- Added call to aspell to spell check. +- Fixed incorrect other credit title in PDF. BZ #454394 +- Turned on Hyphenation to split verbatim lines. +- Added code highlighting to CSS and PDF +- Remove trailing '.' from formal para title. BZ #455826 +- Restructure CSS for easier maintenance of brands +- Add documentation on publican design philosophy. BZ #456170 +- Italicised package tag. BZ #442668 +- Updated documentation descriptions of Book_Info.xml tags. BZ #456489 BZ #456488 -* Tue Jul 15 2008 Jeff Fearn 0.33-1 -- Change kde reqs to a more portable format * Mon Apr 7 2008 Jeff Fearn 0.33-0 - Remove release from package name in html desktop spec file @@ -364,6 +461,8 @@ rm -rf $RPM_BUILD_ROOT - Added Legal_Notice to common - Moved balance of non-translatable entities out of Translatable-entities.ent, updated po files - Added missing Req perl-SGML-Translate, used for translation reports +- Updated documentation descriptions of Book_Info.xml tags. BZ #456489 BZ #456488 + * Tue May 01 2007 Jeff Fearn 0.10 - fix image dimensions on content/common/en-US/images/redhat-logo.svg diff --git a/sources b/sources index d7e81aa..ed068fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a8450730a6aa3fa6fa362d95465e46e publican-0.33.tgz +6a2f366acfaa8af0119f8c5fde2d9f05 publican-0.34.tgz