Merge branch 'f14' into f12

* f14:
  * Wed Aug  4 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.92-2 - rebuild with perl-5.12.1 again
  dist-git conversion
  Update to 1.92
  - Mass rebuild with perl-5.12.0
  - rebuild against perl 5.10.1
  Fix typo that causes a failure to update the common directory. (releng     #2781)

Conflicts:
	.gitignore

ack.spec

@@ -1,6 +1,6 @@
 Name:           ack
-Version:        1.86
-Release:        3%{?dist}
+Version:        1.92
+Release:        2%{?dist}
 Summary:        Grep-like text finder
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -45,9 +45,20 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_vendorlib}/*
 %{_bindir}/ack
 %{_mandir}/man1/*
-%{_mandir}/man3/*
 
 %changelog
+* Wed Aug  4 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.92-2
+- rebuild with perl-5.12.1 again
+
+* Wed Jun 16 2010 Ian Burrell <ianburrell@gmail.com> - 1.92-1
+- Update to 1.92
+
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano@redhat.com> - 1.86-5
+- Mass rebuild with perl-5.12.0
+
+* Fri Dec  4 2009 Stepan Kasal <skasal@redhat.com> - 1.86-4
+- rebuild against perl 5.10.1
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.86-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 

sources

@@ -1 +1 @@
-bef9bb58d4b3cf542d178abe46f0985a  ack-1.86.tar.gz
+c25b5a16d0a27386a75c91d531b86cea  ack-1.92.tar.gz