[rt3/el6] fix EL6 filtering

Xavier Bachelot xavierb at fedoraproject.org
Wed Jul 11 19:38:08 UTC 2012


commit 76fecd481e8d8f104c3a0a763cc3a2e94f106936
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Wed Jul 11 13:35:10 2012 +0200

    fix EL6 filtering

 rt3.spec |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)
---
diff --git a/rt3.spec b/rt3.spec
index 1680605..3f666d6 100644
--- a/rt3.spec
+++ b/rt3.spec
@@ -45,7 +45,7 @@
 
 Name:		rt3
 Version:	3.8.13
-Release:	1%{?dist}.1
+Release:	1%{?dist}.2
 Summary:	Request tracker 3
 
 Group:		Applications/Internet
@@ -206,6 +206,7 @@ Provides: perl(RT::Tickets_Overlay_SQL)
 # Split out. Technically, not actually necessary, but ... let's keep it for now.
 Requires: rt3-mailgate
 
+%if 0%{?fedora}
 # Keep SpamAssassin optional
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(Mail::SpamAssassin\\)
 # Keep FCGI optional
@@ -220,7 +221,27 @@ Requires: rt3-mailgate
 # Filter bogus provides
 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(HTML::Mason
 %global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\(IO::Handle::CRLF\\)$
+%endif
 
+%if 0%{?rhel}
+# 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
+}
+%endif
 
 %description
 RT is an enterprise-grade ticketing system which enables a group of people
@@ -499,6 +520,9 @@ fi
 %endif
 
 %changelog
+* Tue Jul 10 2012 Xavier Bachelot <xavier at bachelot.org> - 3.8.13-1.2
+- Fix filtering for EL6.
+
 * Mon Jun 04 2012 Xavier Bachelot <xavier at bachelot.org> - 3.8.13-1.1
 - Default to non-devel mode for non-Fedora builds.
 


More information about the scm-commits mailing list