From 0bf81d266f0e93c55982e98eebedfd2f92dfc87a Mon Sep 17 00:00:00 2001
From: Emmanuel Seyman <emmanuel.seyman@club-internet.fr>
Date: Sun, 26 Feb 2012 23:48:13 +0100
Subject: [PATCH] Update to 4.2

---
 .gitignore              |  1 +
 bugzilla-rw-paths.patch | 14 +++++++-------
 bugzilla.spec           | 19 +++++++++++--------
 sources                 |  2 +-
 4 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2734649..9d38efa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-4.0.3.tar.gz
 /bugzilla-4.0.4.tar.gz
 /bugzilla-4.0.5.tar.gz
+/bugzilla-4.2.tar.gz
diff --git a/bugzilla-rw-paths.patch b/bugzilla-rw-paths.patch
index 9c4e2f8..66b0d87 100644
--- a/bugzilla-rw-paths.patch
+++ b/bugzilla-rw-paths.patch
@@ -1,12 +1,12 @@
---- bugzilla-4.0.1/Bugzilla/Constants.pm	2011-08-05 12:14:57.301671513 +0200
-+++ bugzilla-4.0.1-rw/Bugzilla/Constants.pm	2011-08-05 12:16:51.798741609 +0200
-@@ -605,18 +605,18 @@ sub bz_locations {
-         'cgi_path'    => $libpath,
+--- bugzilla-4.2/Bugzilla/Constants.pm	2012-02-26 22:39:30.161462858 +0100
++++ bugzilla-4.2-rw/Bugzilla/Constants.pm	2012-02-26 22:41:55.185107179 +0100
+@@ -629,18 +629,18 @@
          'templatedir' => "$libpath/template",
+         'template_cache' => "$datadir/template",
          'project'     => $project,
 -        'localconfig' => "$libpath/$localconfig",
--        'datadir'     => "$libpath/$datadir",
--        'attachdir'   => "$libpath/$datadir/attachments",
+-        'datadir'     => $datadir,
+-        'attachdir'   => "$datadir/attachments",
 +        'localconfig' => "/etc/bugzilla/localconfig",
 +        'datadir'     => "/var/lib/bugzilla/$datadir",
 +        'attachdir'   => "/var/lib/bugzilla/$datadir/attachments",
@@ -19,7 +19,7 @@
          # change showdependencygraph.cgi to set image_url to the correct 
          # location.
          # The script should really generate these graphs directly...
--        'webdotdir'   => "$libpath/$datadir/webdot",
+-        'webdotdir'   => "$datadir/webdot",
 +        'webdotdir'   => "/var/lib/bugzilla/$datadir/webdot",
          'extensionsdir' => "$libpath/extensions",
      };
diff --git a/bugzilla.spec b/bugzilla.spec
index 94e1f47..1fcf3c9 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,9 +4,9 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 4.0.5
+Version: 4.2
 Group: Applications/Publishing
-Release: 2%{?dist}
+Release: 1%{?dist}
 License: MPLv1.1
 Source0: http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-%{version}.tar.gz
 Source1: bugzilla-httpd-conf
@@ -22,12 +22,13 @@ 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(DBI) >= 1.614
 Requires: perl(Template) >= 2.22
 Requires: perl(Email::Send) >= 2.00
 Requires: perl(Email::MIME) >= 1.904
-Requires: perl(URI)
+Requires: perl(URI) >= 1.37
 Requires: perl(List::MoreUtils) >= 0.22
+Requires: perl(Math::Random::ISAAC) >= 1.0.1
 Requires: perl(Locale::Language)
 
 %package doc
@@ -170,7 +171,7 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/template
 %{bzinstallprefix}/bugzilla/cron.daily
 %{bzinstallprefix}/bugzilla/cron.whine
-%{bzinstallprefix}/bugzilla/contrib/recode.pl
+%{bzinstallprefix}/bugzilla/contrib/README
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/bugzilla.conf
 %defattr(-,root,root,-)
 %doc README
@@ -198,7 +199,6 @@ popd > /dev/null)
 
 %files contrib
 %defattr(-,root,root,-)
-%{bzinstallprefix}/bugzilla/contrib/bugzilla_ldapsync.rb
 %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.rhel
 %{bzinstallprefix}/bugzilla/contrib/bugzilla-queue.suse
 %{bzinstallprefix}/bugzilla/contrib/bugzilla-submit
@@ -214,13 +214,16 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/merge-users.pl
 %{bzinstallprefix}/bugzilla/contrib/mysqld-watcher.pl
 %{bzinstallprefix}/bugzilla/contrib/new-yui.sh
-%{bzinstallprefix}/bugzilla/contrib/README
+%{bzinstallprefix}/bugzilla/contrib/recode.pl
 %{bzinstallprefix}/bugzilla/contrib/sendbugmail.pl
 %{bzinstallprefix}/bugzilla/contrib/sendunsentbugmail.pl
 %{bzinstallprefix}/bugzilla/contrib/syncLDAP.pl
-%{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh
 
 %changelog
+* Sun Feb 26 2012 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 4.2-1
+- Update to 4.2 (#797225)
+- Include contrib/README instead of contrib/recode.pl in the main package
+
 * Sun Feb 26 2012 Emmanuel Seyman <emmanuel.seyman@club-internet.fr> - 4.0.5-2
 - Leave perl(Bugzilla::Extension::Example::Util) in the provides stream
 
diff --git a/sources b/sources
index f28ab97..7d44e24 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c5b73f5ddfecbf4772852e73ddfd94e4  bugzilla-4.0.5.tar.gz
+7c712b26fbf7d8684f57c2e89caff422  bugzilla-4.2.tar.gz