[ack/el5/master: 22/22] Merge branch 'el6' into el5

[Ian Burrell]

commit 657f81b17b6d6d047b280d35a17765c3c7f2fd38
Merge: 899312b 1dcd449
Author: Ian Burrell <imb at rentrak.com>
Date:   Thu Sep 2 21:49:41 2010 -0700

    Merge branch 'el6' into el5
    
    * el6:
      * Wed Aug  4 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.92-2 - rebuild with perl-5.12.1 again
      dist-git conversion
      dist-git conversion
      Update to 1.92
      - Mass rebuild with perl-5.12.0
      Initialize branch EL-6 for ack
      - rebuild against perl 5.10.1
      Fix typo that causes a failure to update the common directory. (releng     #2781)
      Fix typo that causes a failure to update the common directory. (releng     #2781)
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
      Update to 1.86
      update to 1.78
      Rebuild for new perl
      Update to 1.76
      Update to 1.64; add Test::More to BuildRequires
      Disable tests
      Update to 1.62; enable tests
      add BuildRequires perl(ExtUtils::MakeMaker)
      update to 1.60
    
    Conflicts:
    	ack.spec
    	sources

 ack.spec |    6 ++++--
 sources  |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --cc ack.spec
index ade91bb,54cb867..c2433a0
--- a/ack.spec
+++ b/ack.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           ack
- Version:        1.86
+ Version:        1.92
 -Release:        2%{?dist}
 +Release:        1%{?dist}
  Summary:        Grep-like text finder
  License:        GPL+ or Artistic
  Group:          Development/Libraries
@@@ -45,9 -45,26 +45,11 @@@ rm -rf $RPM_BUILD_ROO
  %{perl_vendorlib}/*
  %{_bindir}/ack
  %{_mandir}/man1/*
- %{_mandir}/man3/*
  
  %changelog
 -* Wed Aug  4 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.92-2
 -- rebuild with perl-5.12.1 again
 -
+ * Wed Jun 16 2010 Ian Burrell <ianburrell at gmail.com> - 1.92-1
+ - Update to 1.92
+ 
 -* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.86-5
 -- Mass rebuild with perl-5.12.0
 -
 -* Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 1.86-4
 -- rebuild against perl 5.10.1
 -
 -* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.86-3
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 -
 -* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.86-2
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 -
  * Sat Aug 23 2008 Ian Burrell <ianburrell at gmail.com> - 1.86-1
  - Update to 1.86