[bugzilla/f15/master] Remove no-longer-needed files Fix broken dependencies Remove unused patch Put contrib/recode.pl in t

[Emmanuel Seyman]

commit a1446b85c246306e7320eb7e74dea78c86752473
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Mon Mar 7 00:59:35 2011 +0100

    Remove no-longer-needed files
    Fix broken dependencies
    Remove unused patch
    Put contrib/recode.pl in the main package so that it no longer
      depends on python and ruby
    Remove the contents of the lib/ directory, not the directory itself.

 bugzilla-graphs-dir.patch |  104 ---------------------------------------------
 bugzilla.spec             |   41 ++++++++++++++---
 2 files changed, 33 insertions(+), 112 deletions(-)
---
diff --git a/bugzilla.spec b/bugzilla.spec
index 12ac564..c81480a 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
@@ -29,7 +28,6 @@ Requires: perl(Email::MIME::Encodings) >= 1.313
 Requires: perl(Email::MIME::Modifier) >= 1.442
 Requires: perl(Template) >= 2.22
 Requires: perl(URI)
-Requires: bugzilla-contrib
 
 %package doc
 Summary: Bugzilla documentation
@@ -45,7 +43,8 @@ Group: Applications/Publishing
 BuildRequires: python
 
 # 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(DBD::Oracle)/d; /perl(DBI::st)/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 +55,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
@@ -76,10 +75,9 @@ Contributed scripts and functions for Bugzilla
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-# patch1 -p0
 rm -f Bugzilla/Constants.pm.orig
 # Remove bundled libs
-rm -rf lib/*
+rm -rf lib/CGI*
 
 # Deal with changing /usr/local paths here instead of via patches
 %{__perl} -pi -e 's|/usr/local/bin/python\b|%{__python}|' contrib/*.py
@@ -141,11 +139,13 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/extensions
 %{bzinstallprefix}/bugzilla/images
 %{bzinstallprefix}/bugzilla/js
+%{bzinstallprefix}/bugzilla/lib
 %{bzinstallprefix}/bugzilla/skins
 %{bzinstallprefix}/bugzilla/t
 %{bzinstallprefix}/bugzilla/template
 %{bzinstallprefix}/bugzilla/cron.daily
 %{bzinstallprefix}/bugzilla/cron.whine
+%{bzinstallprefix}/bugzilla/contrib/recode.pl
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
 %defattr(-,root,root,-)
 %doc README
@@ -167,9 +167,34 @@ popd > /dev/null)
 
 %files contrib
 %defattr(-,root,root,-)
-%{bzinstallprefix}/bugzilla/contrib
+%{bzinstallprefix}/bugzilla/contrib/bugzilla_ldapsync.rb
+%{bzinstallprefix}/bugzilla/contrib/bugzilla-queue
+%{bzinstallprefix}/bugzilla/contrib/bugzilla-submit
+%{bzinstallprefix}/bugzilla/contrib/bzdbcopy.pl
+%{bzinstallprefix}/bugzilla/contrib/bz_webservice_demo.pl
+%{bzinstallprefix}/bugzilla/contrib/cmdline
+%{bzinstallprefix}/bugzilla/contrib/console.pl
+%{bzinstallprefix}/bugzilla/contrib/cvs-update.pl
+%{bzinstallprefix}/bugzilla/contrib/extension-convert.pl
+%{bzinstallprefix}/bugzilla/contrib/fixperms.pl
+%{bzinstallprefix}/bugzilla/contrib/jb2bz.py*
+%{bzinstallprefix}/bugzilla/contrib/merge-users.pl
+%{bzinstallprefix}/bugzilla/contrib/mysqld-watcher.pl
+%{bzinstallprefix}/bugzilla/contrib/README
+%{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl
+%{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl
+%{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl
+%{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh
 
 %changelog
+* Mon Mar 07 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6.4-5
+- Remove no-longer-needed files
+- Fix broken dependencies
+- Remove unused patch
+- Put contrib/recode.pl in the main package so that it no longer depends on
+  python and ruby
+- Remove the contents of the lib/ directory, not the directory itself.
+
 * 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