Merge branch 'master' into el6

This commit is contained in:
Robin Lee 2014-03-29 15:06:03 +08:00
commit 57def9502e
3 changed files with 56 additions and 10 deletions

5
.gitignore vendored
View file

@ -1,2 +1,7 @@
/ack-1.94.tar.gz
/ack-1.96.tar.gz
/ack-2.00.tar.gz
/ack-2.04.tar.gz
/ack-2.08.tar.gz
/ack-2.10.tar.gz
/ack-2.12.tar.gz

View file

@ -1,20 +1,23 @@
Name: ack
Version: 1.96
Version: 2.12
Release: 1%{?dist}
Summary: Grep-like text finder
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
URL: http://betterthangrep.com/
Source0: http://www.cpan.org/modules/by-module/App/%{name}-%{version}.tar.gz
BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker)
BuildRequires: perl(File::Basename)
BuildRequires: perl(File::Next) >= 0.40
BuildRequires: perl(Data::Dumper)
BuildRequires: perl(File::Next) >= 1.10
BuildRequires: perl(Getopt::Long)
BuildRequires: perl(Pod::Usage)
BuildRequires: perl(Term::ANSIColor)
BuildRequires: perl(Text::ParseWords) >= 3.1
BuildRequires: perl(Test::Harness) >= 2.5
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Pod)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
%description
@ -35,20 +38,58 @@ 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
%files
%doc ack-help.txt ack-help-types.txt Changes README.markdown
%doc Changes LICENSE.md README.md
%{perl_vendorlib}/*
%{_bindir}/ack
%{_mandir}/man1/*
%{_sysconfdir}/bash_completion.d
%changelog
* Wed Dec 11 2013 Robin Lee <cheeselee@fedoraproject.org> - 2.12-1
- Update to 2.12
- fixes BZ#1040228, BZ#1040229,
CVE request http://www.openwall.com/lists/oss-security/2013/12/10/10
* Wed Sep 25 2013 Robin Lee <cheeselee@fedoraproject.org> - 2.10-1
- Update to 2.10
* Fri Aug 23 2013 Robin Lee <cheeselee@fedoraproject.org> - 2.08-1
- Update to 2.08
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.04-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Sun Jul 21 2013 Petr Pisar <ppisar@redhat.com> - 2.04-2
- Perl 5.18 rebuild
* Mon Apr 29 2013 Robin Lee <cheeselee@fedoraproject.org> - 2.04-1
- Update to 2.04
* Thu Apr 18 2013 Robin Lee <cheeselee@fedoraproject.org> - 2.00-1
- Update to 2.0
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.96-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.96-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Wed Jun 27 2012 Petr Pisar <ppisar@redhat.com> - 1.96-5
- Perl 5.16 rebuild
* Wed Jun 13 2012 Robin Lee <cheeselee@fedoraproject.org> - 1.96-4
- BR: perl(Data::Dumper)
* Wed Jun 13 2012 Petr Pisar <ppisar@redhat.com> - 1.96-3
- Perl 5.16 rebuild
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.96-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* 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

View file

@ -1 +1 @@
21701fb5f4670181dbf6ebe47984634b ack-1.96.tar.gz
11e886ab0ec72173869a82e59227ddf2 ack-2.12.tar.gz