commit 82ec733ae49eff328f630b07eb60179dd9b212e1
Author: Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx>
Date: Tue Jan 10 18:54:19 2012 +0100
Fix broken dependency filtering having been added in *-4.
Spec file cleanup.
rt3.spec | 52 +++++++++++++++++-----------------------------------
1 files changed, 17 insertions(+), 35 deletions(-)
---
diff --git a/rt3.spec b/rt3.spec
index 14bccd9..1427374 100644
--- a/rt3.spec
+++ b/rt3.spec
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2005, 2006, 2007, 2008, 2009, 2010, 2011, Ralf Corsepius, Ulm, Germany.
+# Copyright (c) 2005-2012, Ralf Corsepius, Ulm, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -31,16 +31,16 @@
# Default: without (doesn't work in chroots.)
%bcond_with tests
-%define RT3_BINDIR %{_sbindir}
-%define RT3_LIBDIR %{perl_vendorlib}
-%define RT3_WWWDIR %{_datadir}/rt3/html
-%define RT3_LOGDIR %{_localstatedir}/log/rt3
-%define RT3_CACHEDIR %{_localstatedir}/cache/rt3
-%define RT3_LOCALSTATEDIR %{_localstatedir}/lib/rt3
+%global RT3_BINDIR %{_sbindir}
+%global RT3_LIBDIR %{perl_vendorlib}
+%global RT3_WWWDIR %{_datadir}/rt3/html
+%global RT3_LOGDIR %{_localstatedir}/log/rt3
+%global RT3_CACHEDIR %{_localstatedir}/cache/rt3
+%global RT3_LOCALSTATEDIR %{_localstatedir}/lib/rt3
Name: rt3
Version: 3.8.10
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Request tracker 3
Group: Applications/Internet
@@ -78,13 +78,13 @@ BuildRequires: perl(Devel::StackTrace) >= 1.19
BuildRequires: perl(Digest::base)
BuildRequires: perl(Digest::MD5) >= 2.27
BuildRequires: perl(Email::Address)
-BuildRequires: perl(Encode) >= 2.13
+BuildRequires: perl(Encode) >= 2.21
BuildRequires: perl(Errno)
%{?with_devel_mode:BuildRequires: perl(File::Find)}
BuildRequires: perl(File::Glob)
BuildRequires: perl(File::ShareDir)
BuildRequires: perl(File::Spec) >= 0.8
-BuildRequires: perl(File::Temp) >= 0.18
+BuildRequires: perl(File::Temp) >= 0.19
%{?with_gd:BuildRequires: perl(GD)}
%{?with_gd:BuildRequires: perl(GD::Graph)}
%{?with_gd:BuildRequires: perl(GD::Text)}
@@ -198,28 +198,8 @@ Requires: rt3-mailgate
Provides: config(rt3) = %{version}-%{release}
Requires: config(rt3) = %{version}-%{release}
-
-# RPM 4.8 style:
-%{?perl_default_filter:
# Keep SpamAssassin optional
-%filter_from_requires /^perl(Mail::SpamAssassin)/d
-# Keep FCGI optional
-%filter_from_requires /^perl(FCGI::ProcManager)/d
-# Filter bogus requires
-%filter_from_requires /^perl()/d
-# Filter redundant provides
-%filter_from_provides /^perl(RT)$/d
-# Filter bogus provides
-%filter_from_provides /^perl(HTML::Mason/d
-%filter_from_provides /^perl(IO::Handle::CRLF)$/d
-# Work-around rpm's depgenerator defect:
-%filter_from_requires /^perl(DBIx::SearchBuilder::Handle::)$/d
-%perl_default_filter
-}
-
-# RPM 4.9 style:
-# Keep SpamAssassin optional
-%global %__requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Mail::SpamAssassin\\)
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Mail::SpamAssassin\\)
# Keep FCGI optional
%global __requires_exclude %__requires_exclude|^perl\\(FCGI::ProcManager\\)
# Filter bogus requires
@@ -268,10 +248,8 @@ sed -e 's,@RT3_LOGDIR@,%{RT3_LOGDIR},' %{SOURCE5} \
> rt3.logrotate
# Fixup the tarball shipping with broken permissions
-find . \( -name '*.pm' -o -name '*.pm.in' -o -name '*.po' -o -name '*.pod' \) \
- -exec chmod a-x {} \;
-chmod -x UPGRADING README C* aclocal.* config.* *.ac *.in
-find etc -type f -exec chmod a-x {} \;
+find \( -type f -a -executable \) -exec chmod a-x {} \;
+chmod +x configure install-sh
# Upstream tarball contains temporary autotools-files.
rm -rf autom4te.cache config.log config.status
@@ -464,6 +442,10 @@ fi
%endif
%changelog
+* Tue Jan 10 2012 Ralf Corsépius <corsepiu@xxxxxxxxxxxxxxxxx> - 3.8.10-5
+- Fix broken dependency filtering having been added in *-4.
+- Spec file cleanup.
+
* Mon Jul 25 2011 Petr Pisar <ppisar@xxxxxxxxxx> - 3.8.10-4
- RPM 4.9 dependency filtering added
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
