[perl-File-MMagic/el6: 8/9] Merge branch 'el6' into el5

[Paul Howarth]

commit 3922aaa6444d94ed347d5c7dee204d20aae5eaf0
Merge: 8dcf1a7 f5d732f
Author: Paul Howarth <paul at city-fan.org>
Date:   Tue Sep 20 12:38:42 2011 +0100

    Merge branch 'el6' into el5
    
    Conflicts:
    	perl-File-MMagic.spec

 perl-File-MMagic.spec |   23 ++++++++++++++++++++---
 1 files changed, 20 insertions(+), 3 deletions(-)
---
diff --cc perl-File-MMagic.spec
index 5b82f73,a6c0816..d28b96c
--- a/perl-File-MMagic.spec
+++ b/perl-File-MMagic.spec
@@@ -51,8 -51,25 +51,25 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
+ * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-7
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+ 
+ * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.27-6
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+ 
+ * Sat Feb  2 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.27-5
+ - rebuild for new perl
+ 
+ * Fri Oct 26 2007 Robin Norwood <rnorwood at redhat.com> - 1.27-4
+ - Remove BR: perl for package review
+ - Resolves: bz#226257
+ 
+ * Wed Aug 29 2007 Robin Norwood <rnorwood at redhat.com> - 1.27-3
+ - Update license tag
+ - Add BuildRequires: perl(ExtUtils::MakeMaker)
+ 
 -* Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> - 1.27-2.fc8
 -- Add fixes from EPEL branch
 +* Fri Jul 20 2007 Robin Norwood <rnorwood at redhat.com> - 1.27-2
 +- Build for EPEL 4/5
  - Fix minor specfile issues
  
  * Mon Jun 05 2006 Jason Vas Dias <jvdias at redhat.com> - 1.27-1