[bugzilla] Update to 4.0.1 and patch the installation procedure to recommend yum

Emmanuel Seyman eseyman at fedoraproject.org
Sun May 1 15:38:16 UTC 2011


commit f545e77abdf2b0c48c77463a23ec0aff3eca229f
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Sun May 1 17:36:01 2011 +0200

    Update to 4.0.1 and patch the installation procedure to recommend yum

 .gitignore         |    1 +
 bugzilla-yum.patch |   20 ++++++++++++++++++++
 bugzilla.spec      |    8 +++++++-
 sources            |    2 +-
 4 files changed, 29 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index efb1f37..9f899a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ bugzilla-3.6.1.tar.gz
 /bugzilla-3.6.4.tar.gz
 /bugzilla-4.0-1.fc14.src.rpm
 /bugzilla-4.0.tar.gz
+/bugzilla-4.0.1.tar.gz
diff --git a/bugzilla-yum.patch b/bugzilla-yum.patch
new file mode 100644
index 0000000..9d53205
--- /dev/null
+++ b/bugzilla-yum.patch
@@ -0,0 +1,20 @@
+--- bugzilla-4.01/Bugzilla/Install/Requirements.pm	2011-05-01 17:09:35.000000000 +0200
++++ bugzilla-4.01-yum/Bugzilla/Install/Requirements.pm	2011-05-01 17:11:28.000000000 +0200
+@@ -587,7 +587,7 @@
+     if ($output && $check_results->{any_missing} && !ON_ACTIVESTATE
+         && !$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'), COLOR_ERROR),
+@@ -732,7 +732,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};
diff --git a/bugzilla.spec b/bugzilla.spec
index 8e32647..cd881c4 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 4.0
+Version: 4.0.1
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -13,6 +13,7 @@ Source1: bugzilla-httpd-conf
 Source2: README.fedora.bugzilla
 Source3: bugzilla.cron-daily
 Patch0: bugzilla-rw-paths.patch
+Patch1: bugzilla-yum.patch
 
 BuildArch: noarch
 Requires: webserver, patchutils, perl(SOAP::Lite), which
@@ -92,6 +93,7 @@ Contributed scripts and functions for Bugzilla
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1
+%patch1 -p1
 rm -f Bugzilla/Constants.pm.orig
 # Remove bundled libs
 rm -rf lib/CGI*
@@ -203,6 +205,10 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib/yp_nomail.sh
 
 %changelog
+* Sun May 01 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 4.0.1-1
+- Update to 4.0.1
+- Patch the installation procedure to recommend yum
+
 * Sun Mar 27 2011 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 4.0-1
 - Update to 4.0
 
diff --git a/sources b/sources
index b991f61..031f4e5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1539d5fa8b4b11e6334a56862d6d076  bugzilla-4.0.tar.gz
+2785598c9787f3fe2edad97360c36306  bugzilla-4.0.1.tar.gz


More information about the scm-commits mailing list