[bugzilla/f12/master] * Update to 3.4.8 (#623426, #615331) * Only run checksetup if /etc/bugzilla/localconfig does not

[Emmanuel Seyman]

commit 3dfeb1b163cda53ddcbc82ee77cc4ed95fd2cc86
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Thu Aug 19 00:10:54 2010 +0200

      * Update to 3.4.8 (#623426, #615331)
      * Only run checksetup if /etc/bugzilla/localconfig does not exist (#610210)
      * Add bugzilla-contrib to Requires (#610198)
      * Remove mod_perl from the requirements (#600924)

 .gitignore    |    1 +
 bugzilla.spec |   13 ++++++++++---
 sources       |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d44a18a..4ae8851 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bugzilla-3.4.7.tar.gz
+/bugzilla-3.4.8.tar.gz
diff --git a/bugzilla.spec b/bugzilla.spec
index ee3d7a1..b320f15 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,7 +4,7 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.4.7
+Version: 3.4.8
 Group: Applications/Publishing
 Release: 1%{?dist}
 License: MPLv1.1
@@ -15,7 +15,7 @@ Patch0: bugzilla-rw-paths.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
@@ -26,6 +26,7 @@ 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: bugzilla-contrib
 
 %package doc
 Summary: Bugzilla documentation
@@ -117,7 +118,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
@@ -163,6 +164,12 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Thu Aug 19 2010 Emmanuel Seyman <emmanuel.seyman at 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)
+- Remove mod_perl from the requirements (#600924)
+
 * Fri Jun 25 2010 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.4.7-1
 - Update to 3.4.7 (CVE-2010-1204)
 
diff --git a/sources b/sources
index b423207..4442e1f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-093368cea8c487cce24b23156329a0ab  bugzilla-3.4.7.tar.gz
+1b045455035e10094f57a2e160abe121  bugzilla-3.4.8.tar.gz