From 6e1d0848856b59adf630d7467e72c227cdcc19cd Mon Sep 17 00:00:00 2001 From: Ruediger Landmann Date: Thu, 28 Jul 2011 13:46:45 +1000 Subject: [PATCH] Supply rpmlint config file --- publican.spec | 27 +++++++++++---------------- sources | 2 +- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/publican.spec b/publican.spec index 47e86d7..e3953ab 100644 --- a/publican.spec +++ b/publican.spec @@ -1,7 +1,7 @@ # 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} @@ -21,7 +21,7 @@ Name: publican Version: 2.6 -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 @@ -31,7 +31,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 @@ -172,7 +172,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" @@ -232,21 +232,16 @@ rm -rf $RPM_BUILD_ROOT %doc fdl.txt %changelog +* Thu Jul 28 2011 Jeff Fearn 2.6-3 +- Force publican to use UTF8 for command line options. +- Add rpmlint cfg for brew checks. + +* Wed Jul 27 2011 Jeff Fearn 2.6-2 +- Fix archness ... java hate increases + * Mon Jul 25 2011 Jeff Fearn 2.6-1 - New Version, see Changes file. -* Thu Jul 21 2011 Petr Sabata - 2.5-5 -- Perl mass rebuild - -* Thu Jul 21 2011 Petr Sabata - 2.5-4 -- Perl mass rebuild - -* Tue Jul 19 2011 Petr Sabata - 2.5-3 -- Perl mass rebuild - -* Wed Feb 09 2011 Fedora Release Engineering - 2.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - * Fri Dec 02 2010 Jeff Fearn 2.5-1 - Use SPEC_VERSION for splash page spec files. diff --git a/sources b/sources index fa00931..40623a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -551503d154145fbdef38bbd567efbdcc Publican-2.6.tar.gz +64db10f2e6e7b0ee3380375879d2dd97 Publican-2.6.tar.gz