[bugzilla/el5: 34/35] Merge remote-tracking branch 'origin/f11/master' into el5

[Xavier Bachelot]

commit cd5c397143949ac06f1ada547693ccbd699f82b1
Merge: 940cb6c b2d95bf
Author: Xavier Bachelot <xavier at bachelot.org>
Date:   Tue May 3 00:10:56 2011 +0200

    Merge remote-tracking branch 'origin/f11/master' into el5
    
    Conflicts:
    	.gitignore
    	bugzilla-rw-paths.patch
    	bugzilla.spec
    	sources

 .gitignore              |    2 +-
 bugzilla-httpd-conf     |    1 +
 bugzilla-rw-paths.patch |   12 +++++++-----
 bugzilla.spec           |   27 ++++++++++++++++++++++-----
 sources                 |    2 +-
 5 files changed, 32 insertions(+), 12 deletions(-)
---
diff --cc bugzilla.spec
index 9750d6d,cd428c7..caa0c9f
--- a/bugzilla.spec
+++ b/bugzilla.spec
@@@ -145,9 -149,17 +151,20 @@@ popd > /dev/null
  %{bzinstallprefix}/bugzilla/contrib
  
  %changelog
+ * Tue Feb 02 2010 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.2.6-2
+ - Use Linux requirements, not Windows'
+ 
+ * Mon Feb 01 2010 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.2.6-1
+ - Update to 3.2.6 (CVE-2009-3989, CVE-2009-3387)
+ - Specify Perl module versions in the Requires (fixes #524309)
+ - Add an alias to make $webdotdir a working path (fixes #458848)
+ 
+ * Fri Sep 11 2009 Emmanuel Seyman <emmanuel.seyman at club-internet.fr> - 3.2.5-1
+ - Update to 3.2.5 (CVE-2009-3125, CVE-2009-3165 and CVE-2009-3166)
+ 
 +* Tue Aug 04 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-2
 +- fix EL-5 perl dependencies bz#515158
 +
  * Wed Jul 08 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 3.2.4-1
  - fix https://bugzilla.mozilla.org/show_bug.cgi?id=495257