[publican] Rebase on upstream 2.7

[Rüdiger Landmann]

commit b58fbd6df603f3d4de41ab19fa0c693a55a0230a
Author: Ruediger Landmann <r.landmann at redhat.com>
Date:   Tue Sep 6 13:43:51 2011 +1000

    Rebase on upstream 2.7

 .gitignore    |    1 +
 publican.spec |   39 +++++++++------------------------------
 sources       |    2 +-
 3 files changed, 11 insertions(+), 31 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9407846..dbb9517 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ Publican-2.1.tar.gz
 /Publican-2.4.tar.gz
 /Publican-2.5.tar.gz
 /Publican-2.6.tar.gz
+/Publican-2.7.tar.gz
diff --git a/publican.spec b/publican.spec
index e3953ab..f641788 100644
--- a/publican.spec
+++ b/publican.spec
@@ -1,18 +1,12 @@
 
 # Track font name changes
-%define RHEL5 %(test %{?dist} == .el5 && echo 1 || echo 0)
 %define RHEL6 %([[ %{?dist}x == .el6[a-z]* ]] && echo 1 || echo 0)
 # Assume not rhel means FC11+ ... ugly
 %define OTHER 1
+
 %if %{RHEL6}
 %define OTHER 0
 %endif
-%if %{RHEL5}
-%define OTHER 0
-%endif
-
-# who doesn't have xdg-open?
-%define HTMLVIEW %{RHEL5}
 
 # required for desktop file install
 %define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat")
@@ -20,8 +14,8 @@
 %define TESTS 0
 
 Name:           publican
-Version:        2.6
-Release:        3%{?dist}
+Version:        2.7
+Release:        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
@@ -66,6 +60,7 @@ BuildRequires:  perl(File::Find)
 BuildRequires:  perl(File::Find::Rule)
 BuildRequires:  perl(File::Path)
 BuildRequires:  perl(File::pushd)
+BuildRequires:  perl(File::Which)
 BuildRequires:  perl(HTML::FormatText)
 BuildRequires:  perl(HTML::TreeBuilder)
 BuildRequires:  perl(I18N::LangTags::List)
@@ -84,7 +79,7 @@ BuildRequires:  perl(XML::LibXML)  >=  1.67
 BuildRequires:  perl(XML::LibXSLT) >=  1.67
 BuildRequires:  perl(XML::Simple)
 BuildRequires:  perl(XML::TreeBuilder) >= 4.0
-BuildRequires:  fop >= 0.95
+BuildRequires:  fop
 BuildRequires:  batik
 BuildRequires:  docbook-style-xsl >= 1.76.1
 BuildRequires:  desktop-file-utils
@@ -95,7 +90,7 @@ BuildRequires:  perl(DBD::SQLite)
 # Most of these are handled automatically
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl(Locale::Maketext::Gettext)
-Requires:       fop >= 0.95
+Requires:       fop
 Requires:       batik rpm-build
 Requires:       docbook-style-xsl >= 1.76.1
 Requires:       perl(XML::LibXML)  >=  1.67
@@ -109,17 +104,6 @@ Requires:       perl(DBD::SQLite)
 Requires:       rpmlint
 
 # 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
-#BuildRequires:  java-1.5.0-sun java-1.5.0-sun-devel chkconfig
-%endif
 %if %{RHEL6}
 Requires:       liberation-mono-fonts liberation-sans-fonts liberation-serif-fonts
 Requires:       cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
@@ -151,11 +135,7 @@ your XML is up to publishable standard.
 %package doc
 Group:          Documentation
 Summary:        Documentation for the Publican package
-%if %{HTMLVIEW}
-Requires:       htmlview
-%else
 Requires:       xdg-utils
-%endif
 Obsoletes:      Publican-doc < 1.0
 # Do NOT support very old packages
 #Provides:       Publican-doc = 1.0
@@ -190,10 +170,6 @@ 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
 
-%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
 
 for file in po/*.po; do
@@ -232,6 +208,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc fdl.txt
 
 %changelog
+* Tue Sep 06 2011 Jeff Fearn <jfearn at redhat.com> 2.7-1
+- New release.
+
 * Thu Jul 28 2011 Jeff Fearn <jfearn at redhat.com> 2.6-3
 - Force publican to use UTF8 for command line options.
 - Add rpmlint cfg for brew checks.
diff --git a/sources b/sources
index 40623a3..c502b98 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-64db10f2e6e7b0ee3380375879d2dd97  Publican-2.6.tar.gz
+93811964419307a91c5aacd049bf77ae  Publican-2.7.tar.gz