Update to 3.4.11

* Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210)
  * Add bugzilla-contrib to Requires (#610198)

.cvsignore

@@ -1 +0,0 @@
-bugzilla-3.4.4.tar.gz

.gitignore

@@ -0,0 +1,5 @@
+bugzilla-3.4.7.tar.gz
+/bugzilla-3.4.8.tar.gz
+/bugzilla-3.4.9.tar.gz
+/bugzilla-3.4.10.tar.gz
+/bugzilla-3.4.11.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: bugzilla
-# $Id$
-NAME := bugzilla
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

bugzilla-EL5-perl-versions.patch

@@ -1,33 +0,0 @@
-diff -ruNp a/bugzilla-3.4.1/Bugzilla/Constants.pm b/bugzilla-3.4.1/Bugzilla/Constants.pm
---- a/bugzilla-3.4.1/Bugzilla/Constants.pm	2009-08-01 11:28:41.000000000 -0300
-+++ b/bugzilla-3.4.1/Bugzilla/Constants.pm	2009-08-04 01:26:18.761892048 -0300
-@@ -400,7 +400,7 @@ use constant DB_MODULE => {
-                     # Disallow development versions
-                     blacklist => ['_'],
-                     # For UTF-8 support
--                    version => '4.00',
-+                    version => '3.00',
-                 },
-                 name => 'MySQL'},
-     'pg'    => {db => 'Bugzilla::DB::Pg', db_version => '8.00.0000',
-diff -ruNp a/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm b/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm
---- a/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm	2009-07-24 15:58:46.000000000 -0300
-+++ b/bugzilla-3.4.1/Bugzilla/Install/Requirements.pm	2009-08-04 01:27:02.852909164 -0300
-@@ -118,7 +118,7 @@ sub REQUIRED_MODULES {
-     {
-         package => 'Email-MIME',
-         module  => 'Email::MIME',
--        version => '1.861'
-+        version => '1.859'
-     },
-     {
-         package => 'Email-MIME-Encodings',
-@@ -129,7 +129,7 @@ sub REQUIRED_MODULES {
-     {
-         package => 'Email-MIME-Modifier',
-         module  => 'Email::MIME::Modifier',
--        version => '1.442'
-+        version => '1.441'
-     },
-     {
-         package => 'URI',

bugzilla-rw-paths.patch

@@ -1,6 +1,6 @@
---- bugzilla-3.4/Bugzilla/Constants.pm        2009-02-03 10:02:53.000000000 +0000
+--- bugzilla-3.4/Bugzilla/Constants.pm.orig	2010-11-03 01:47:33.000000000 +0100
-+++ bugzilla-3.4-rw/Bugzilla/Constants.pm     2009-02-18 17:59:52.000000000 +0000
++++ bugzilla-3.4-rw/Bugzilla/Constants.pm	2010-11-04 00:00:51.000000000 +0100
-@@ -499,9 +499,9 @@ sub bz_locations {
+@@ -511,9 +511,9 @@
          'cgi_path'    => $libpath,
          'templatedir' => "$libpath/template",
          'project'     => $project,
@@ -11,9 +11,9 @@
 +        'datadir'     => "/var/lib/bugzilla/$datadir",
 +        'attachdir'   => "/var/lib/bugzilla/$datadir/attachments",
          'skinsdir'    => "$libpath/skins",
+         'graphsdir'   => "$libpath/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 
+@@ -522,7 +522,7 @@
-@@ -509,7 +509,7 @@ sub bz_locations {
          # change showdependencygraph.cgi to set image_url to the correct 
          # location.
          # The script should really generate these graphs directly...

bugzilla.spec

@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.4.4
+Version: 3.4.11
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -12,11 +12,10 @@ 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-EL5-perl-versions.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
-Requires: webserver, patchutils, mod_perl, perl(SOAP::Lite), perl(Digest::SHA), which
+Requires: webserver, patchutils, perl(SOAP::Lite), perl(Digest::SHA), which
 Requires: perl(CGI) >= 3.33
 Requires: perl(Date::Format) >= 2.21
 Requires: perl(DateTime) >= 0.28
@@ -59,7 +58,6 @@ Contributed scripts and functions for Bugzilla
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
-%patch1 -p2
 
 # Filter unwanted Requires found by /usr/lib/rpm/perldeps.pl:
 # create a wrapper script which runs the original perl_requires
@@ -119,7 +117,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
@@ -140,6 +138,7 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/lib/README
 %{bzinstallprefix}/bugzilla/cron.daily
 %{bzinstallprefix}/bugzilla/cron.whine
+%{bzinstallprefix}/bugzilla/contrib/recode.pl
 %ghost %{bzinstallprefix}/bugzilla/bugzilla-req
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
 %defattr(-,root,root,-)
@@ -162,9 +161,57 @@ 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/cvs-update.pl
+%{bzinstallprefix}/bugzilla/contrib/fixperms.pl
+%{bzinstallprefix}/bugzilla/contrib/gnats2bz.pl
+%{bzinstallprefix}/bugzilla/contrib/gnatsparse
+%{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 May 01 2011 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.11-1
+- Update to 3.4.11
+
+* Tue Mar 08 2011 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.10-2
+- Put contrib/recode.pl in the main package so that it no longer depends on
+  python and ruby
+ 
+* Tue Jan 25 2011 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.10-1
+- Update to 3.4.10
+
+* Wed Nov 03 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.9-1
+- Update to 3.4.9
+
+* Thu Aug 19 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.8-2
+- Bump to correct changelog version
+
+* Wed Aug 18 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.8-1
+- Update to 3.4.8 (#623426, #615331)
+- Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210)
+- Add bugzilla-contrib to Requires (#610198)
+
+* Wed Jun 30 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.7-2
+- Remove mod_perl from the requirements (#600924)
+
+* Fri Jun 25 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.7-1
+- Update to 3.4.7 (CVE-2010-1204)
+
+* Mon Feb 01 2010 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.5-1
+- Update to 3.4.5 (CVE-2009-3989, CVE-2009-3387)
+- Remove bugzilla-EL5-perl-versions.patch which is EPEL-specific
+
 * Thu Nov 19 2009 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 3.4.4-1
 - Update to 3.4.4 (CVE-2009-3386)
 

import.log

@@ -1,5 +0,0 @@
-bugzilla-3_0_8-1_fc11:HEAD:bugzilla-3.0.8-1.fc11.src.rpm:1235878106
-bugzilla-3_2_2-2_fc10:HEAD:bugzilla-3.2.2-2.fc10.src.rpm:1236265998
-bugzilla-3_2_3-1_fc11:HEAD:bugzilla-3.2.3-1.fc11.src.rpm:1239059931
-bugzilla-3_2_4-1_fc11:HEAD:bugzilla-3.2.4-1.fc11.src.rpm:1247080670
-bugzilla-3_4_1-2_fc12:HEAD:bugzilla-3.4.1-2.fc12.src.rpm:1249360212

sources

@@ -1 +1 @@
-a59031c15fb79e9096c0a350c2382cfe  bugzilla-3.4.4.tar.gz
+37b9c3ff57327afaa3b1a37d87fb9a8a  bugzilla-3.4.11.tar.gz