[bugzilla/f14/master] * Update to 3.6.2 (#623426) * Only run checksetup if /etc/bugzilla/localconfig does not exist (#61

[Emmanuel Seyman]

commit 04c7f203bec90dc70bdf72d856a289c49cb5042e
Author: Emmanuel Seyman <emmanuel.seyman at club-internet.fr>
Date:   Wed Aug 18 23:44:59 2010 +0200

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

 .gitignore    |    1 +
 bugzilla.spec |   12 +++++++++---
 sources       |    2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d9e78fa..33e8d46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bugzilla-3.6.1.tar.gz
+/bugzilla-3.6.2.tar.gz
diff --git a/bugzilla.spec b/bugzilla.spec
index 33488f2..f11d3b9 100644
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@ -4,9 +4,9 @@
 Summary: Bug tracking system
 URL: http://www.bugzilla.org/
 Name: bugzilla
-Version: 3.6.1
+Version: 3.6.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
@@ -29,6 +29,7 @@ Requires: perl(Email::MIME) >= 1.861
 Requires: perl(Email::MIME::Encodings) >= 1.313
 Requires: perl(Email::MIME::Modifier) >= 1.442
 Requires: perl(URI)
+Requires: bugzilla-contrib
 
 %package doc
 Summary: Bugzilla documentation
@@ -139,7 +140,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
@@ -185,6 +186,11 @@ popd > /dev/null)
 %{bzinstallprefix}/bugzilla/contrib
 
 %changelog
+* Wed Aug 18 2010 Emmanuel Seyman <emmanuel.seyman at 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 at redhat.com> - 3.6.1-2
 - recompiling .py files against Python 2.7 (rhbz#623281)
 
diff --git a/sources b/sources
index b82e8e4..e1881b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-74045f64fa7698f61ef24ef44b2e2074  bugzilla-3.6.1.tar.gz
+c8bd9b81969cce1a0199a739b48bda06  bugzilla-3.6.2.tar.gz