From 04544e5456994155d4594b59685fa5c81509bd04 Mon Sep 17 00:00:00 2001 From: Jeff Fearn Date: Thu, 12 Mar 2009 06:42:31 +0000 Subject: [PATCH] update to version 0.44 --- .cvsignore | 2 +- publican.spec | 86 +++++++++++++++++++++++++++++++++++++-------------- sources | 2 +- 3 files changed, 64 insertions(+), 26 deletions(-) diff --git a/.cvsignore b/.cvsignore index 947f24e..9cedf08 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -publican-0.40.tgz +publican-0.44.tgz diff --git a/publican.spec b/publican.spec index e1b60c8..2e43676 100644 --- a/publican.spec +++ b/publican.spec @@ -1,12 +1,14 @@ %define my_vendor fedora %define EMBED_DOCKBOOK45 0 %define HTMLVIEW 0 -%define RHEL 0 +%define PREMOLESTATION 0 +%define FC10 0 +%define FC11 1 Name: publican Summary: Common files and scripts for publishing with DocBook XML -Version: 0.40 -Release: 5%{?dist} +Version: 0.44 +Release: 0%{?dist} License: GPLv2+ and GFDL # The following directories are licensed under the GFDL: # content, Book_Template, Set_Template, Article_Template @@ -14,7 +16,6 @@ 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 -# need kdesdk for po2xml & xml2pot Requires: gettext libxslt docbook-dtds docbook-style-xsl elinks aspell Requires: %{_bindir}/xml2pot %{_bindir}/po2xml Requires: perl-ParseLex perl-HTML-Template make @@ -26,12 +27,11 @@ 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 -# FOP is required to build the font metrics. -BuildRequires: fop -BuildRequires: ImageMagick saxon +BuildRequires: fop saxon ImageMagick #BuildRequires: xslthl -# Fedora renamed its fonts under upstream package names and subpackaged families -%if %{RHEL} +# *&%^*&^ decided to rename font packages and change font paths. +# No actual real changes. +%if %{PREMOLESTATION} Requires: xslthl Requires: fonts-bengali fonts-chinese fonts-chinese-zysong fonts-gujarati Requires: fonts-hindi fonts-japanese fonts-kannada fonts-korean @@ -42,7 +42,19 @@ 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 +%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 %{FC11} Requires: liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts Requires: lohit-fonts-bengali cjkuni-uming-fonts lohit-fonts-gujarati Requires: lohit-fonts-hindi sazanami-gothic-fonts sazanami-mincho-fonts lohit-fonts-kannada @@ -84,8 +96,7 @@ solely on using the publican tools. %setup -q %build -%{__make} docs -#./fop-fonts --dist=%{?dist} +%{__make} OS_VER=%{?dist} docs %install rm -rf $RPM_BUILD_ROOT @@ -147,22 +158,49 @@ rm -rf $RPM_BUILD_ROOT %doc fdl.txt %changelog -* Thu Feb 26 2009 Fedora Release Engineering - 0.40-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild +* Wed Mar 11 2009 Jeff Fearn 0.44 +- Add 0-9 and '.' to DOCNAME regex. BZ #489626 -* Mon Feb 9 2009 Jens Petersen - 0.40-4 -- update the sazanami-fonts subpackage names -- list liberation-fonts subpackages explicitly +* Mon Mar 9 2009 Jeff Fearn 0.43 +- Fix many warnings about 'body-start() called from outside an fo:list-item' BZ #484628 +- Fix Initial build of new lang failing. BZ #485179 +- Add lang to final doc root node. BZ #486162 +- Add embed for stanky IE. BZ #486501 +- Add symlinks for langauges without country codes. BZ #487256 +- Add rudimentary Obsoletes logic. RT #36366 +- Rolled in following from fedora devel spec +- - Mon Feb 9 2009 Jens Petersen - 0.40-4 +- - update the sazanami-fonts subpackage names +- - list liberation-fonts subpackages explicitly +- - Fri Feb 6 2009 Alex Lancaster - 0.40-3 +- - Fix broken font deps: liberation-fonts -> liberation-fonts-compat +- - Sat Jan 24 2009 Caolán McNamara - 0.40-2 +- - cjkunifonts-uming -> cjkuni-uming-fonts +- - Thu Jan 22 2009 Alex Lancaster - 0.40-1 +- - Font changes baekmuk-ttf-fonts-batang -> baekmuk-ttf-batang-fonts to +- fix broken deps in rawhide +- Fri Mar 6 2009 Piotr Drąg +- Translate Document Conventions into Polish +- Thu Mar 5 2009 Piotr Drąg +- Translate common Feedback section into Polish +- Wed Mar 4 2009 Richard van der Luit +- Corrections to Document Conventions in Dutch +- Mon Mar 2 2009 Richard van der Luit +- Translate Document Conventions into Dutch +- Sat Feb 28 2009 Rui Gouveia +- Translate Document Conventions into European Portuguese -* Fri Feb 6 2009 Alex Lancaster - 0.40-3 -- Fix broken font deps: liberation-fonts -> liberation-fonts-compat -* Sat Jan 24 2009 Caolán McNamara - 0.40-2 -- cjkunifonts-uming -> cjkuni-uming-fonts -* Thu Jan 22 2009 Alex Lancaster - 0.40-1 -- Font changes baekmuk-ttf-fonts-batang -> baekmuk-ttf-batang-fonts to - fix broken deps in rawhide +* Thu Jan 29 2009 Jeff Fearn 0.42 +- Support chapterinfo, keywordset & keyword tags. +- Add SRC_URL. BZ #482968 +- Fix web package removal when dep package has been removed. + +* Mon Jan 19 2009 Jeff Fearn 0.41 +- Fix Source tar name. +- Fix brew srpm path +- Added OS_VER to allow over ride of OS srpm is created for. * Mon Jan 5 2009 Jeff Fearn 0.40 - Fix DRAFT mode in web docs. diff --git a/sources b/sources index 8c48b0f..05e99d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f51def0740d27198220f0db3fb5f05e publican-0.40.tgz +720fcfd8903fe370a69107350e2afa22 publican-0.44.tgz