[bugzilla] Fix broken dependencies and remove a non-longer used patch

Emmanuel Seyman eseyman at fedoraproject.org
Mon Feb 14 00:45:37 UTC 2011


commit 780f1060a8fa4901d8d8d16a85a6ddb7ff1b4166
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Mon Feb 14 01:44:58 2011 +0100

    Fix broken dependencies and remove a non-longer used patch

 bugzilla-graphs-dir.patch |  104 ---------------------------------------------
 bugzilla.spec             |   14 ++++--
 2 files changed, 10 insertions(+), 108 deletions(-)
---
diff --git a/bugzilla.spec b/bugzilla.spec
index 12ac564..6a536c9 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,13 +6,12 @@ URL: http://www.bugzilla.org/
 Name: bugzilla
 Version: 3.6.4
 Group: Applications/Publishing
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
-Patch1: bugzilla-graphs-dir.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -44,8 +43,11 @@ Summary: Bugzilla contributed scripts
 Group: Applications/Publishing
 BuildRequires: python
 
+# Fedora does not ship Oracle
+%filter_requires_in %{bzinstallprefix}/Bugzilla/DB/Oracle.pm
+
 # Remove all optional modules from the requires stream
-%filter_from_requires /perl(Authen::Radius)/d; /perl(DBD::Pg)/d; /perl(DBD::Oracle)/d;
+%filter_from_requires /perl(Authen::Radius)/d; /perl(DBD::Pg)/d; /perl(DBI::db)/d;
 %filter_from_requires /perl(sanitycheck.cgi)/d; /perl(Apache2::Const)/d;
 %filter_from_requires /perl(Apache2::ServerUtil)/d; /perl(ModPerl::RegistryLoader)/d;
 %filter_from_requires /perl(CPAN)/d; /perl(Net::LDAP)/d; /perl(Email::Reply)/d;
@@ -56,7 +58,7 @@ BuildRequires: python
 # Remove extensions from the provides stream
 %filter_from_provides /perl(Bugzilla::Extension::BmpConvert)/d; /perl(Bugzilla::Extension::Example)/d;
 
-%{?perl_default_filter}
+%filter_setup
 
 %description
 Bugzilla is a popular bug tracking system used by multiple open source projects
@@ -170,6 +172,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Mon Feb 14 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6.4-5
+- Fix broken dependencies
+- Remove unused patch
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.6.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list