[perl-Mail-SPF/el5/master: 12/12] Merge branch 'master' into el5

[Nick Bebout]

commit 55b2f30c45b9c04a8ca7f71e08efe6f77679c2b9
Merge: 00a05c1 35c2242
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Tue Mar 8 19:14:01 2011 -0600

    Merge branch 'master' into el5
    
    Conflicts:
    	.gitignore
    	perl-Mail-SPF.spec
    	sources

 .gitignore         |    2 +-
 perl-Mail-SPF.spec |    8 ++++----
 sources            |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
---
diff --cc perl-Mail-SPF.spec
index 45ee059,8bae340..7a90a47
--- a/perl-Mail-SPF.spec
+++ b/perl-Mail-SPF.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           perl-Mail-SPF
- Version:        2.006
+ Version:        2.007
 -Release:        2%{?dist}
 +Release:        1%{?dist}
  Summary:        Object-oriented implementation of Sender Policy Framework
  License:        BSD
  Group:          Development/Libraries
@@@ -59,12 -59,27 +59,12 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man3/*
  
  %changelog
 -* Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.007-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
+ * Sun Dec 5 2010 Nick Bebout <nb at fedoraproject.org> - 2.007-1
+ - Update to 2.007
+ 
 -* Mon May 03 2010 Marcela Maslanova <mmaslano at redhat.com> - 2.006-5
 -- Mass rebuild with perl-5.12.0
 -
 -* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 2.006-4
 -- rebuild against perl 5.10.1
 -
 -* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.006-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 -
 -* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.006-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 -
 -* Fri Dec 12 2008 Steven Pritchard <steve at kspei.com> 2.006-1
 -- Update to 2.006.
 +* Fri Sep 25 2009 Warren Togami <wtogami at redhat.com> 2.006-1.el5
 +- build for EL-5
  
- * Fri Dec 12 2008 Steven Pritchard <steve at kspei.com> 2.006-1
- - Update to 2.006.
- 
  * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.005-2
  - Rebuild for new perl