[bugzilla/f14/master] Put contrib/recode.pl in the main package so that it no longer depends on python and ruby Remove th

[Emmanuel Seyman]

commit b023613f7ac9706b2bcf8e7742bf1f579e73b4c9
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Mon Mar 7 01:54:56 2011 +0100

    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.
    Remove unused patch

 bugzilla-graphs-dir.patch |  104 ---------------------------------------------
 bugzilla.spec             |   34 ++++++++++++---
 2 files changed, 28 insertions(+), 110 deletions(-)
---
diff --git a/bugzilla.spec b/bugzilla.spec
index d61f91b..45a1631 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: 1%{?dist}
+Release: 2%{?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
@@ -62,10 +60,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*
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -155,11 +152,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
 %ghost %{bzinstallprefix}/bugzilla/bugzilla-req
 %ghost %{bzinstallprefix}/bugzilla/bugzilla-prov
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
@@ -183,9 +182,32 @@ 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-2
+- 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.
+- Remove unused patch
+
 * Tue Jan 25 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.6.4-1
 - Update to 3.6.4