Update to 3.6.6, move graphs to /var/lib/bugzilla/graphs.

Remove the contents of the lib/ directory, not the directory itself.
Remove unused patch

.gitignore

@@ -1 +1,6 @@
 bugzilla-3.6.1.tar.gz
+/bugzilla-3.6.2.tar.gz
+/bugzilla-3.6.3.tar.gz
+/bugzilla-3.6.4.tar.gz
+/bugzilla-3.6.5.tar.gz
+/bugzilla-3.6.6.tar.gz

bugzilla-graphs-dir.patch

@@ -1,104 +0,0 @@
-Index: collectstats.pl
-===================================================================
-RCS file: /cvsroot/mozilla/webtools/bugzilla/collectstats.pl,v
-retrieving revision 1.71
-diff -u -r1.71 collectstats.pl
---- collectstats.pl	6 Sep 2009 22:45:51 -0000	1.71
-+++ collectstats.pl	16 May 2010 09:22:28 -0000
-@@ -51,7 +51,7 @@
- 
- # Tidy up after graphing module
- my $cwd = Cwd::getcwd();
--if (chdir("graphs")) {
-+if (chdir(bz_locations()->{'graphdir'})) {
-     unlink <./*.gif>;
-     unlink <./*.png>;
-     # chdir("..") doesn't work if graphs is a symlink, see bug 429378
-Index: reports.cgi
-===================================================================
-RCS file: /cvsroot/mozilla/webtools/bugzilla/reports.cgi,v
-retrieving revision 1.95
-diff -u -r1.95 reports.cgi
---- reports.cgi	24 Oct 2009 05:21:06 -0000	1.95
-+++ reports.cgi	16 May 2010 09:22:28 -0000
-@@ -45,6 +45,8 @@
- use Bugzilla::Error;
- use Bugzilla::Status;
- 
-+use File::Basename;
-+
- # If we're using bug groups for products, we should apply those restrictions
- # to viewing reports, as well.  Time to check the login in that case.
- my $user = Bugzilla->login();
-@@ -54,8 +56,8 @@
- }
- 
- my $dir       = bz_locations()->{'datadir'} . "/mining";
--my $graph_url = 'graphs';
--my $graph_dir = bz_locations()->{'libpath'} . '/' .$graph_url;
-+my $graph_dir = bz_locations()->{'graphdir'};
-+my $graph_url = basename($graph_dir);
- 
- Bugzilla->switch_to_shadow_db();
- 
-Index: Bugzilla/Constants.pm
-===================================================================
-RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Constants.pm,v
-retrieving revision 1.126.2.5
-diff -u -r1.126.2.5 Constants.pm
---- Bugzilla/Constants.pm	13 Apr 2010 04:56:24 -0000	1.126.2.5
-+++ Bugzilla/Constants.pm	16 May 2010 09:22:29 -0000
-@@ -551,6 +551,7 @@
-         # The script should really generate these graphs directly...
-         'webdotdir'   => "/var/lib/bugzilla/$datadir/webdot",
-         'extensionsdir' => "$libpath/extensions",
-+        'graphdir' => "$libpath/graphs",
-     };
- }
- 
-Index: Bugzilla/Install/Filesystem.pm
-===================================================================
-RCS file: /cvsroot/mozilla/webtools/bugzilla/Bugzilla/Install/Filesystem.pm,v
-retrieving revision 1.47.2.1
-diff -u -r1.47.2.1 Filesystem.pm
---- Bugzilla/Install/Filesystem.pm	20 Feb 2010 20:20:55 -0000	1.47.2.1
-+++ Bugzilla/Install/Filesystem.pm	16 May 2010 09:22:29 -0000
-@@ -69,6 +69,7 @@
-     my $attachdir     = bz_locations()->{'attachdir'};
-     my $extensionsdir = bz_locations()->{'extensionsdir'};
-     my $webdotdir     = bz_locations()->{'webdotdir'};
-+    my $graphdir      = bz_locations()->{'graphdir'};
-     my $templatedir   = bz_locations()->{'templatedir'};
-     my $libdir        = bz_locations()->{'libpath'};
-     my $extlib        = bz_locations()->{'ext_libpath'};
-@@ -162,7 +163,7 @@
-                                   dirs => $ws_dir_writeable },
-          $webdotdir         => { files => $ws_writeable,
-                                   dirs => $ws_dir_writeable },
--         graphs             => { files => $ws_writeable,
-+         $graphdir          => { files => $ws_writeable,
-                                   dirs => $ws_dir_writeable },
- 
-          # Readable directories
-@@ -212,7 +213,7 @@
-         "$datadir/extensions"   => $ws_dir_readable,
-         $attachdir              => $ws_dir_writeable,
-         $extensionsdir          => $ws_dir_readable,
--        graphs                  => $ws_dir_writeable,
-+        $graphdir               => $ws_dir_writeable,
-         $webdotdir              => $ws_dir_writeable,
-         "$skinsdir/custom"      => $ws_dir_readable,
-         "$skinsdir/contrib"     => $ws_dir_readable,
-@@ -342,10 +343,11 @@
-     my %files = %{$fs->{create_files}};
- 
-     my $datadir = bz_locations->{'datadir'};
-+    my $graphdir = bz_locations->{'graphdir'};
-     # If the graphs/ directory doesn't exist, we're upgrading from
-     # a version old enough that we need to update the $datadir/mining 
-     # format.
--    if (-d "$datadir/mining" && !-d 'graphs') {
-+    if (-d "$datadir/mining" && !-d $graphdir) {
-         _update_old_charts($datadir);
-     }
- 

bugzilla-httpd-conf

@@ -1,4 +1,4 @@
-Alias /bugzilla/var/lib/bugzilla/data/webdot /var/lib/bugzilla/data/webdot
+Alias /var/lib/bugzilla/data/webdot /var/lib/bugzilla/data/webdot
 Alias /bugzilla /usr/share/bugzilla
 
 <Directory /usr/share/bugzilla>

bugzilla-rw-paths.patch

@@ -1,6 +1,6 @@
---- bugzilla-3.4/Bugzilla/Constants.pm        2009-02-03 10:02:53.000000000 +0000
+--- bugzilla-3.6.6/Bugzilla/Constants.pm	2011-08-05 15:42:01.768441860 +0200
-+++ bugzilla-3.4-rw/Bugzilla/Constants.pm     2009-02-18 17:59:52.000000000 +0000
++++ bugzilla-3.6.6-rw/Bugzilla/Constants.pm	2011-08-05 15:44:50.342628808 +0200
-@@ -499,9 +499,9 @@ sub bz_locations {
+@@ -539,18 +539,18 @@ sub bz_locations {
          'cgi_path'    => $libpath,
          'templatedir' => "$libpath/template",
          'project'     => $project,
@@ -11,9 +11,11 @@
 +        'datadir'     => "/var/lib/bugzilla/$datadir",
 +        'attachdir'   => "/var/lib/bugzilla/$datadir/attachments",
          'skinsdir'    => "$libpath/skins",
+-        'graphsdir'   => "$libpath/graphs",
++        'graphsdir'   => "/var/lib/bugzilla/graphs",
          # $webdotdir must be in the web server's tree somewhere. Even if you use a 
          # local dot, we output images to there. Also, if $webdotdir is 
-@@ -509,7 +509,7 @@ sub bz_locations {
+         # not relative to the bugzilla root directory, you'll need to 
          # change showdependencygraph.cgi to set image_url to the correct 
          # location.
          # The script should really generate these graphs directly...

bugzilla-yum.patch

@@ -0,0 +1,20 @@
+--- bugzilla-3.6.5/Bugzilla/Install/Requirements.pm.orig	2011-01-24 23:05:19.000000000 +0100
++++ bugzilla-3.6.5/Bugzilla/Install/Requirements.pm	2011-05-01 18:06:34.000000000 +0200
+@@ -483,7 +483,7 @@
+     if ($output && $check_results->{any_missing} && !ON_WINDOWS
+         && !$check_results->{hide_all}) 
+     {
+-        print install_string('install_all', { perl => $^X });
++        # print install_string('install_all', { perl => $^X });
+     }
+     if (!$check_results->{pass}) {
+         print colored(install_string('installation_failed'), 'red') . "\n\n";
+@@ -599,7 +599,7 @@
+         $package = $module->{package};
+     }
+     else {
+-        $command = "$^X install-module.pl \%s";
++        $command = "yum install \"perl(\%s)\"";
+         # Non-Windows installations need to use module names, because
+         # CPAN doesn't understand package names.
+         $package = $module->{module};

bugzilla.spec

@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.6.1
+Version: 3.6.6
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -12,22 +12,22 @@ Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar
 Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Patch0: bugzilla-rw-paths.patch
-Patch1: bugzilla-graphs-dir.patch
+Patch1: bugzilla-yum.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: webserver, patchutils, perl(SOAP::Lite), which
-Requires: perl(CGI) >= 3.33
+Requires: perl(CGI) >= 3.51
-Requires: perl(Digest::SHA)
 Requires: perl(Date::Format) >= 2.21
 Requires: perl(DateTime) >= 0.28
 Requires: perl(DateTime::TimeZone) >= 0.71
 Requires: perl(DBI) >= 1.41
-Requires: perl(Template) >= 2.22
+Requires: perl(Digest::SHA)
 Requires: perl(Email::Send) >= 2.00
 Requires: perl(Email::MIME) >= 1.861
 Requires: perl(Email::MIME::Encodings) >= 1.313
 Requires: perl(Email::MIME::Modifier) >= 1.442
+Requires: perl(Template) >= 2.22
 Requires: perl(URI)
 
 %package doc
@@ -61,10 +61,10 @@ Contributed scripts and functions for Bugzilla
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p0
+%patch1 -p1
 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
@@ -139,7 +139,7 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %post
 (pushd %{bzinstallprefix}/bugzilla > /dev/null
-./checksetup.pl > /dev/null
+[ -f /etc/bugzilla/localconfig ] || ./checksetup.pl > /dev/null
 popd > /dev/null)
 
 %files
@@ -154,11 +154,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
@@ -182,9 +184,56 @@ 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
+* Fri Aug 05 2011 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.6.6-1
+- Update to 3.6.6
+- Move graphs to /var/lib/bugzilla/graphs.
+
+* Sun May 01 2011 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.6.5-1
+- Update to 3.6.5
+- Patch the installation procedure to recommend yum
+
+* Mon Mar 07 2011 Emmanuel Seyman <emmanuel.seyman@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@club-internet.fr> - 3.6.4-1
+- Update to 3.6.4
+
+* Wed Nov 03 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.6.3-1
+- Update to 3.6.3 (#649406)
+- Fix webdot alias in /etc/httpd/conf.d/bugzilla (#630255)
+- Do not apply graphs patch (upstreamed)
+
+* Wed Aug 18 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.6.2-1
+- Update to 3.6.2 (#623426)
+- Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210)
+- Add bugzilla-contrib to Requires (#610198)
+
+* Wed Aug 11 2010 David Malcolm <dmalcolm@redhat.com> - 3.6.1-2
+- recompiling .py files against Python 2.7 (rhbz#623281)
+
 * Fri Jun 25 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.6.1-1
 - Update to 3.6.1
 

sources

@@ -1 +1 @@
-74045f64fa7698f61ef24ef44b2e2074  bugzilla-3.6.1.tar.gz
+c6f4f2128a6443b35b277ed19df03647  bugzilla-3.6.6.tar.gz