[mod_perl: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/mod_perl

[Jan Kaluža]

commit 99b7bc171849351ee31b3492f1621303f1dd05f3
Merge: 91619ea 99c898b
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Wed Jul 25 13:18:59 2012 +0200

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/mod_perl
    
    Conflicts:
    	mod_perl.spec

 mod_perl.spec |   30 ++++++++++++++++++++----------
 1 files changed, 20 insertions(+), 10 deletions(-)
---
diff --cc mod_perl.spec
index 3f0b834,e2f1a82..5b45754
--- a/mod_perl.spec
+++ b/mod_perl.spec
@@@ -4,7 -4,7 +4,7 @@@
  
  Name:           mod_perl
  Version:        2.0.7
- Release:        2%{?dist}
 -Release:        6%{?dist}
++Release:        7%{?dist}
  Summary:        An embedded Perl interpreter for the Apache HTTP Server
  
  Group:          System Environment/Daemons
@@@ -183,9 -178,21 +178,24 @@@ echo "%%exclude %{_mandir}/man3/Apache:
  %{_mandir}/man3/Apache::Test*.3pm*
  
  %changelog
- * Wed Jul 25 2012 Jan Kaluza <jkaluza at redhat.com> - 2.0.7-2
++* Wed Jul 25 2012 Jan Kaluza <jkaluza at redhat.com> - 2.0.7-7
 +- updated httpd-2.4 patch
 +
+ * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.7-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
+ * Tue Jul 10 2012 Petr Pisar <ppisar at redhat.com> - 2.0.7-5
+ - Hide dependencies on broken provides
+ 
+ * Mon Jul 09 2012 Petr Pisar <ppisar at redhat.com> - 2.0.7-4
+ - Perl 5.16 rebuild
+ 
+ * Mon Jul 09 2012 Petr Pisar <ppisar at redhat.com> - 2.0.7-3
+ - Rebuild to fix Apache2::MPM dependency on i686
+ 
+ * Fri Jun 29 2012 Petr Pisar <ppisar at redhat.com> - 2.0.7-2
+ - Perl 5.16 rebuild
+ 
  * Fri Jun 29 2012 Jan Kaluza <jkaluza at redhat.com> - 2.0.7-1
  - update to 2.0.7 (#830501)