Merge branch 'master' into el6

.gitignore

@@ -1 +1,2 @@
 /ack-1.94.tar.gz
+/ack-1.96.tar.gz

ack.spec

@@ -1,16 +1,20 @@
 Name:           ack
-Version:        1.94
+Version:        1.96
 Release:        1%{?dist}
 Summary:        Grep-like text finder
-License:        GPL+ or Artistic
+License:        Artistic 2.0
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/ack/
 Source0:        http://www.cpan.org/modules/by-module/App/ack-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(ExtUtils::MakeMaker)
-BuildRequires:  perl(Test::More)
+BuildRequires:  perl(File::Basename)
 BuildRequires:  perl(File::Next) >= 0.40
+BuildRequires:  perl(Getopt::Long)
+BuildRequires:  perl(Pod::Usage)
+BuildRequires:  perl(Term::ANSIColor)
+BuildRequires:  perl(Test::Harness) >= 2.5
+BuildRequires:  perl(Test::More)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -24,8 +28,6 @@ Ack is designed as a replacement for grep.
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
-
 make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
 
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
@@ -33,20 +35,27 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 
 %{_fixperms} $RPM_BUILD_ROOT/*
 
+mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
+cp -p etc/ack.bash_completion.sh %{buildroot}%{_sysconfdir}/bash_completion.d
+
 %check
 make test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
-%doc ack-help.txt ack-help-types.txt Changes
+%doc ack-help.txt ack-help-types.txt Changes README.markdown
 %{perl_vendorlib}/*
 %{_bindir}/ack
 %{_mandir}/man1/*
+%{_sysconfdir}/bash_completion.d
 
 %changelog
+* Wed Jan 11 2012 Robin Lee <cheeselee@fedoraproject.org> - 1.96-1
+- Update to 1.96
+- License changed to 'Artistic 2.0' since 1.90
+
+* Mon Jun 20 2011 Marcela Mašláňová <mmaslano@redhat.com> - 1.94-2
+- Perl mass rebuild
+
 * Thu Apr 21 2011  <ianburrell@gmail.com> - 1.94-1
 - Update to 1.94
 

sources

@@ -1 +1 @@
-dcf68e56bab0d394370fa102c7f08cb0  ack-1.94.tar.gz
+21701fb5f4670181dbf6ebe47984634b  ack-1.96.tar.gz