[publican/f18] require FOP, not wkhtmltopdf
Rüdiger Landmann
rlandmann at fedoraproject.org
Fri May 17 00:04:03 UTC 2013
commit 965c26f21a46dd5f20cfb37b06e4380d2b3a1177
Author: Ruediger Landmann <r.landmann at redhat.com>
Date: Fri May 17 10:05:46 2013 +1000
require FOP, not wkhtmltopdf
publican.spec | 35 +++++++++++++++++++++++------------
sources | 5 -----
2 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/publican.spec b/publican.spec
index 939c6a5..367d0a7 100644
--- a/publican.spec
+++ b/publican.spec
@@ -10,13 +10,19 @@
# required for desktop file install
%define my_vendor %(test %{OTHER} == 1 && echo "fedora" || echo "redhat")
+%if (0%{?fedora} && 0%{?fedora} < 19) || (0%{?rhel} && 0%{?rhel} < 7)
+%global with_desktop_vendor_tag 1
+%else
+%global with_desktop_vendor_tag 0
+%endif
+
%define TESTS 1
%define brand common
%define wwwdir /var/www/html/docs
Name: publican
Version: 3.1.5
-Release: 1%{?dist}
+Release: 3%{?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
@@ -84,7 +90,8 @@ BuildRequires: perl(XML::LibXML) => 1.67
BuildRequires: perl(XML::LibXSLT) => 1.67
BuildRequires: perl(XML::Simple)
BuildRequires: perl(XML::TreeBuilder) => 4.0
-BuildRequires: wkhtmltopdf >= 0.10.0_rc2-5
+BuildRequires: fop
+BuildRequires: batik
BuildRequires: docbook-style-xsl >= 1.77.1
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -95,7 +102,8 @@ 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) >= 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
@@ -136,10 +144,6 @@ BuildRequires: cjkuni-uming-fonts ipa-gothic-fonts ipa-pgothic-fonts
BuildRequires: lklug-fonts baekmuk-ttf-batang-fonts
%endif
-Patch0: xsl-newlines-315.patch
-Patch1: nopdfcover.patch
-Patch2: nopdftest.patch
-
%description
Publican is a DocBook publication system, not just a DocBook processing tool.
As well as ensuring your DocBook XML is valid, publican works to ensure
@@ -167,9 +171,6 @@ Website style for common brand.
%prep
%setup -q -n Publican-v%{version}
-%patch0 -p 1
-%patch1 -p 1
-%patch2 -p 1
%build
%{__perl} Build.PL installdirs=vendor --nocolours=1
@@ -190,7 +191,11 @@ 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
-desktop-file-install --vendor="%{my_vendor}" --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
+desktop-file-install \
+%if 0%{?with_desktop_vendor_tag}
+ --vendor="%{my_vendor}" \
+%endif
+ --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{name}.desktop
for file in po/*.po; do
lang=`echo "$file" | sed -e 's/po\/\(.*\)\.po/\1/'`;
@@ -247,7 +252,7 @@ rm -rf $RPM_BUILD_ROOT
%files doc
%defattr(-,root,root,-)
%doc Users_Guide/publish/desktop/*
-%{_datadir}/applications/%{my_vendor}-%{name}.desktop
+%{_datadir}/applications/*%{name}.desktop
%doc fdl.txt
%files common-web
@@ -256,6 +261,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu May 16 2013 Rüdiger Landmann <rlandmann at redhat.com> 3.1.5-3
+- require FOP, not wkhtmltopdf
+
+* Tue May 14 2013 Jon Ciesla <limburgher at gmail.com> - 3.1.5-2
+- Drop desktop vendor tag.
+
* Wed Mar 20 2013 Rüdiger Landmann <rlandmann at redhat.com> 3.1.5-1
- patch for XSL newlines broken in F18 and newer
- patch for PDFs built with wkhtmltopdf built against system QT
diff --git a/sources b/sources
index c679958..9f5fef7 100644
--- a/sources
+++ b/sources
@@ -1,6 +1 @@
-a4327409d5d1152cd6849dc6ac51e76d Publican-v3.0.0.tar.gz
-f454d68d83bbe1cb23259e1d69a431fb xsl-newlines.patch
34f6057dbc14db9aa05bf2d44d83fe9e Publican-v3.1.5.tar.gz
-b5693676c7fb12a8ce416e23e49ce43f nopdfcover.patch
-3f392881af022770435b7eb3702f6c0b nopdftest.patch
-3f7211863391ba6d5982a7ad13117e8e xsl-newlines-315.patch
More information about the scm-commits
mailing list