[bugzilla] The main bugzilla package no longer depends on the bugzilla-contrib one. This makes it possible to i

[Emmanuel Seyman]

commit 38b37f0231ede0598a3d0661338e033ecaee29f0
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Sun Mar 6 23:23:56 2011 +0100

    The main bugzilla package no longer depends on the bugzilla-contrib one.
    This makes it possible to install bugzilla without having to install
    python and ruby.
    
    The lib directory was needed so only its contents are now removed.

 bugzilla.spec |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)
---
diff --git a/bugzilla.spec b/bugzilla.spec
index 2dc236d..a290285 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -6,7 +6,7 @@ URL: http://www.bugzilla.org/
 Name: bugzilla
 Version: 3.6.4
 Group: Applications/Publishing
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -28,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
@@ -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,31 @@ 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
+* Sun Mar 06 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6.4-7
+- 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.
+
 * Tue Feb 15 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6.4-6
 - More filtering