Compare commits

...

2 Commits
master ... f16

Author SHA1 Message Date
Ruediger Landmann f75bf476c4 Rebase on upstream verson 2.8 2011-09-22 12:38:09 +10:00
Ruediger Landmann 1b451bd7d4 Rebase on upstream 2.7 2011-09-07 17:04:57 +10:00
3 changed files with 24 additions and 48 deletions

2
.gitignore vendored
View File

@ -4,3 +4,5 @@ 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
/Publican-2.8.tar.gz

View File

@ -1,18 +1,12 @@
# Track font name changes
%define RHEL5 %(test %{?dist} == .el5 && echo 1 || echo 0)
%define RHEL6 %(test %{?dist} == .el6 && 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,7 +14,7 @@
%define TESTS 0
Name: publican
Version: 2.6
Version: 2.8
Release: 1%{?dist}
Summary: Common files and scripts for publishing with DocBook XML
# For a breakdown of the licensing, refer to LICENSE
@ -31,7 +25,7 @@ Source0: https://fedorahosted.org/released/publican/Publican-%{version}.t
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Limited to these arches on RHEL 6 due to PDF + Java limitations
%if %{RHEL6}
BuildArch: i386 x86_64
ExclusiveArch: i686 x86_64
%else
BuildArch: noarch
%endif
@ -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
@ -105,21 +100,7 @@ Requires: gettext cvs
Requires: perl-Template-Toolkit
Requires: perl(DBD::SQLite)
# Lets validate some basics
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 +132,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
@ -172,7 +149,7 @@ solely on using the publican tools.
%build
%{__perl} Build.PL installdirs=vendor
./Build
dir=`pwd` && cd Users_Guide && perl -I $dir/blib/lib $dir/blib/script/publican build \
dir=`pwd` && cd Users_Guide && %{__perl} -CA -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"
@ -190,10 +167,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,21 +205,22 @@ rm -rf $RPM_BUILD_ROOT
%doc fdl.txt
%changelog
* Thu Sep 22 2011 Jeff Fearn <jfearn@redhat.com> 2.8-1
- New release.
* Tue Sep 06 2011 Jeff Fearn <jfearn@redhat.com> 2.7-1
- New release.
* Thu Jul 28 2011 Jeff Fearn <jfearn@redhat.com> 2.6-3
- Force publican to use UTF8 for command line options.
- Add rpmlint cfg for brew checks.
* Wed Jul 27 2011 Jeff Fearn <jfearn@redhat.com> 2.6-2
- Fix archness ... java hate increases
* Mon Jul 25 2011 Jeff Fearn <jfearn@redhat.com> 2.6-1
- New Version, see Changes file.
* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2.5-5
- Perl mass rebuild
* Thu Jul 21 2011 Petr Sabata <contyk@redhat.com> - 2.5-4
- Perl mass rebuild
* Tue Jul 19 2011 Petr Sabata <contyk@redhat.com> - 2.5-3
- Perl mass rebuild
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Fri Dec 02 2010 Jeff Fearn <jfearn@redhat.com> 2.5-1
- Use SPEC_VERSION for splash page spec files.

View File

@ -1 +1 @@
551503d154145fbdef38bbd567efbdcc Publican-2.6.tar.gz
1ddcf8e93e96d0e49868f21df41b53a4 Publican-2.8.tar.gz