rpm/ack
SHA256
1
0
Fork 0
forked from pool/ack
Code Pull Requests Activity

Accepting request 184032 from home:namtrac:bugfix

Browse Source 
- Update to version 2.0.4
  * Major update, see http://beyondgrep.com/ack-2.0/ for details
- Refresh ack-ignore-osc.patch, ack-add_spec.patch

OBS-URL: https://build.opensuse.org/request/show/184032
OBS-URL: https://build.opensuse.org/package/show/utilities/ack?expand=0&rev=14
This commit is contained in:
OBS User mrdocs 2013-07-23 00:07:16 +00:00 committed by Git OBS Bridge
parent 42b5176d40
commit b69ccd4a5b
6 changed files with 59 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ack-1.96.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb9d29842d8c5c1ec7ad9b577707aca0e1d278e8e21560dbed76ea3b5aa6cb64
size 111986

3
ack-2.04.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7c58d72f61eec4e6e57a418f3a63c6735eafad20d6c319279fe33edc41ef9ac4
size 209885

34
ack-add_spec.patch
View File

@ -1,22 +1,14 @@
--- ack.orig 2011-02-26 15:42:46.000000000 +0100
+++ ack 2011-02-26 15:43:11.000000000 +0100
@@ -1263,6 +1263,8 @@
vim => [qw( vim )],
yaml => [qw( yaml yml )],
xml => [qw( xml dtd xsl xslt ent )],
+ spec => [qw( spec )],
+ rpm => [qw( spec )],
);
Index: ack-2.04/ConfigDefault.pm
===================================================================
--- ack-2.04.orig/ConfigDefault.pm
+++ ack-2.04/ConfigDefault.pm
@@ -236,6 +236,9 @@ sub _options_block {
# R http://www.r-project.org/
--type-add=rr:ext:R
while ( my ($type,$exts) = each %mappings ) {
--- Ack.pm.orig 2011-02-26 15:43:15.000000000 +0100
+++ Ack.pm 2011-02-26 15:43:30.000000000 +0100
@@ -124,6 +124,8 @@
vim => [qw( vim )],
yaml => [qw( yaml yml )],
xml => [qw( xml dtd xsl xslt ent )],
+ rpm => [qw( spec )],
+ spec => [qw( spec )],
);
while ( my ($type,$exts) = each %mappings ) {
+# RPM
+--type-add=rpm:ext:rpm,spec
+
# Ruby http://www.ruby-lang.org/
--type-add=ruby:ext:rb,rhtml,rjs,rxml,erb,rake,spec
--type-add=ruby:is:Rakefile

45
ack-ignore-osc.patch
View File

@ -1,24 +1,25 @@
Index: ack
Index: ack-2.04/ConfigDefault.pm
===================================================================
--- ack.orig
+++ ack
@@ -1196,6 +1196,7 @@ BEGIN {
'~.plst' => 'Interface Builder',
'.git' => 'Git',
'.hg' => 'Mercurial',
+ '.osc' => 'openSUSE Commander',
'.pc' => 'quilt',
'.svn' => 'Subversion',
_MTN => 'Monotone',
Index: Ack.pm
--- ack-2.04.orig/ConfigDefault.pm
+++ ack-2.04/ConfigDefault.pm
@@ -46,6 +46,9 @@ sub _options_block {
# Mercurial
--ignore-directory=is:.hg
+# openSUSE Commander
+--ignore-directory=is:.osc
+
# quilt
--ignore-directory=is:.pc
Index: ack-2.04/t/ack-dump.t
===================================================================
--- Ack.pm.orig
+++ Ack.pm
@@ -57,6 +57,7 @@ BEGIN {
'~.plst' => 'Interface Builder',
'.git' => 'Git',
'.hg' => 'Mercurial',
+ '.osc' => 'openSUSE Commander',
'.pc' => 'quilt',
'.svn' => 'Subversion',
_MTN => 'Monotone',
--- ack-2.04.orig/t/ack-dump.t
+++ ack-2.04/t/ack-dump.t
@@ -32,5 +32,5 @@ DUMP: {
is( scalar @perl, 2, 'Two specs for Perl' );
my @ignore_dir = grep { /ignore-dir/ } @results;
- is( scalar @ignore_dir, 20, 'Twenty specs for ignoring directories' );
+ is( scalar @ignore_dir, 21, 'Twenty specs for ignoring directories' );
}

7
ack.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Jul 22 21:48:33 UTC 2013 - idonmez@suse.com
- Update to version 2.0.4
* Major update, see http://beyondgrep.com/ack-2.0/ for details
- Refresh ack-ignore-osc.patch, ack-add_spec.patch
-------------------------------------------------------------------
Mon Feb 27 05:45:22 UTC 2012 - mrdocs@opensuse.org

29
ack.spec
View File

@ -2,7 +2,7 @@
#
# spec file for package ack
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -24,7 +24,7 @@
%endif
Name: ack
Version: 1.96
Version: 2.04
Release: 0
Summary: Grep-Like Text Finder
License: Artistic-1.0 or GPL-1.0+
@ -60,14 +60,14 @@ code.
%prep
%setup -q -n "ack-%{version}"
%patch1
%patch1 -p1
%if 0%{?suse_version} > 0 && 0%{?suse_version} < 1000 || 0%{?rhel_version} > 0 && 0%{?rhel_version} < 500
%patch2
%endif
%patch3
%patch3 -p1
%build
%__perl Makefile.PL PREFIX="%{_prefix}"
perl Makefile.PL PREFIX="%{_prefix}"
make %{?_smp_mflags}
%install
@ -76,24 +76,21 @@ make %{?_smp_mflags}
%if 0%{?perl_process_packlist:1}
%perl_process_packlist
%else
%__rm "%{buildroot}%{perl_archlib}/perllocal.pod"
rm "%{buildroot}%{perl_archlib}/perllocal.pod"
%endif
# remove .packlist file
%__rm -rf "%{buildroot}%{perl_vendorarch}/auto/ack"
rm -rf "%{buildroot}%{perl_vendorarch}/auto/ack"
%__rm -f "%{buildroot}/var/adm/perl-modules/ack"
rm -f "%{buildroot}/var/adm/perl-modules/ack"
#%__install -D -m0644 etc/ack.bash_completion.sh \
# "%{buildroot}/%{_sysconfdir}/bash_completion.d/%{name}.sh"
%__install -d rpmdoc_ack
for f in Changes README.markdown TODO; do
%__ln_s ../ack/"$f" rpmdoc_ack/"$f"
install -d rpmdoc_ack
for f in Changes README.md LICENSE.md; do
ln -s ../ack/"$f" rpmdoc_ack/"$f"
done
%check
%__make test
make test
%files
%defattr(-,root,root)
@ -104,7 +101,7 @@ done
%files -n perl-App-Ack
%defattr(-,root,root)
%doc Changes README.markdown TODO
%doc Changes README.md LICENSE.md
%dir %{perl_vendorlib}/App
%{perl_vendorlib}/App/Ack.pm
%{perl_vendorlib}/App/Ack