Attachment 936670 Details for Bug 787825 – patch against f20 branch with deps filtering for EL6.

[patch] patch against f20 branch with deps filtering for EL6.

bz42_for_el6.patch (text/plain), 3.08 KB, created by Xavier Bachelot on 2014-09-11 20:17:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Xavier Bachelot

Created: 2014-09-11 20:17:11 UTC

Size: 3.08 KB

patch

obsolete

>diff --git a/bugzilla.spec b/bugzilla.spec
>index 862a0d1..f758800 100644
>--- a/bugzilla.spec
>+++ b/bugzilla.spec
>@@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/
> Name: bugzilla
> Version: 4.2.10
> Group: Applications/Publishing
>-Release: 1%{?dist}
>+Release: 1%{?dist}.1
> License: MPLv1.1
> Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
> Source1: bugzilla-httpd-conf
>@@ -44,6 +44,7 @@ Summary: Bugzilla contributed scripts
> Group: Applications/Publishing
> BuildRequires: python
> 
>+%if 0%{?fedora} > 0 || 0%{?rhel} > 6
> %{?perl_default_filter}
> 
> # Remove private modules from the requires stream
>@@ -84,6 +85,48 @@ BuildRequires: python
> %global __provides_exclude %__provides_exclude|^perl\$Bugzilla::Extension::OldBugMove\$$
> %global __provides_exclude %__provides_exclude|^perl\$Bugzilla::Extension::OldBugMove::Params\$$
> %global __provides_exclude %__provides_exclude|^perl\$Bugzilla::Extension::Voting\$$
>+%endif
>+
>+%if 0%{?rhel} == 6 
>+# Remove private modules from the requires stream
>+%filter_from_requires /perl(sanitycheck.cgi)/d
>+# Remove all optional modules from the requires stream
>+# mod_perl modules
>+%filter_from_requires /perl(Apache2::/d
>+%filter_from_requires /perl(ModPerl::/d
>+# authentification modules
>+%filter_from_requires /perl(Authen::Radius)/d
>+%filter_from_requires /perl(Net::LDAP)/d
>+# database modules
>+%filter_from_requires /perl(DBD::Oracle)/d
>+%filter_from_requires /perl(DBD::Pg)/d
>+%filter_from_requires /perl(DBI::db)/d
>+%filter_from_requires /perl(DBI::st)/d
>+# inbound email modules
>+%filter_from_requires /perl(Email::MIME::Attachment::Stripper)/d
>+%filter_from_requires /perl(Email::Reply)/d
>+# bug moving modules
>+%filter_from_requires /perl(MIME::Parser)/d
>+%filter_from_requires /perl(XML::Twig)/d
>+# xml-rpc and json-rpc modules
>+%filter_from_requires /perl(XMLRPC::/d
>+%filter_from_requires /perl(HTTP::Message)/d
>+%filter_from_requires /perl(Test::Taint)/d
>+# extension modules
>+%filter_from_requires /perl(Image::Magick)/d
>+
>+# and remove the extensions from the provides stream
>+%filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d
>+%filter_from_provides /perl(Bugzilla::Extension::Example)/d
>+%filter_from_provides /perl(Bugzilla::Extension::Example::Auth::Login)/d
>+%filter_from_provides /perl(Bugzilla::Extension::Example::Auth::Verify)/d
>+%filter_from_provides /perl(Bugzilla::Extension::Example::Config)/d
>+%filter_from_provides /perl(Bugzilla::Extension::Example::WebService)/d
>+%filter_from_provides /perl(Bugzilla::Extension::OldBugMove)/d
>+%filter_from_provides /perl(Bugzilla::Extension::OldBugMove::Params)/d
>+%filter_from_provides /perl(Bugzilla::Extension::Voting)/d
>+%filter_setup
>+%endif
> 
> %description
> Bugzilla is a popular bug tracking system used by multiple open source projects
>@@ -218,6 +261,9 @@ popd > /dev/null)
> %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl
> 
> %changelog
>+* Wed Sep 10 2014 Xavier Bachelot <xavier@bachelot.org> - 4.2.10-1.1
>+- Add Provides/Requires filtering for EL6.
>+
> * Fri Jul 25 2014 Emmanuel Seyman <emmanuel@seyman.fr> - 4.2.10-1
> - Update to 4.2.10 which fixes a security bug (CVE-2014-1546)
>

Actions: View | Diff

Attachments on bug 787825: 846794 | 846795 | 846796 | 847208 | 887605 | 936670