diff --git a/ack-add_spec.patch b/ack-add_spec.patch new file mode 100644 index 0000000..466521c --- /dev/null +++ b/ack-add_spec.patch @@ -0,0 +1,22 @@ +--- 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 )], + ); + + 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 ) { diff --git a/ack.changes b/ack.changes index 7f55ed3..10ea891 100644 --- a/ack.changes +++ b/ack.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Feb 26 14:52:08 UTC 2011 - pascal.bleser@opensuse.org + +- add --spec/--rpm for .spec files + ------------------------------------------------------------------- Tue Nov 16 10:38:26 UTC 2010 - puzel@novell.com diff --git a/ack.spec b/ack.spec index b030975..2c42221 100644 --- a/ack.spec +++ b/ack.spec @@ -1,20 +1,4 @@ -# -# spec file for package ack -# -# Copyright (c) 2011 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - +# vim: set ts=4 sw=4 et: %{!?perl_make_install: %global perl_make_install make DESTDIR=$RPM_BUILD_ROOT install_vendor} @@ -26,15 +10,16 @@ Name: ack Version: 1.94 -Release: 1 +Release: 0 Summary: Grep-Like Text Finder Source: http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/ack-%{version}.tar.gz Patch1: ack-ignore-osc.patch Patch2: ack-fix_smartcase_test_for_old_perl.patch -Url: http://petdance.com/ack/ +Patch3: ack-add_spec.patch +URL: http://petdance.com/ack/ Group: Productivity/Text/Utilities License: Perl License -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRoot: %{_tmppath}/build-%{name}-%{version} Requires: perl BuildRequires: make perl perl-File-Next %if %with_pod @@ -55,7 +40,6 @@ Authors: Andy Lester %package -n perl-App-Ack -License: Perl License Summary: Grep-Like Text Finder Perl Module Group: Development/Libraries/Perl Requires: perl-base = %{perl_version} @@ -70,6 +54,7 @@ code. %if 0%{?suse_version} > 0 && 0%{?suse_version} < 1000 || 0%{?rhel_version} > 0 && 0%{?rhel_version} < 500 %patch2 %endif +%patch3 %build %__perl Makefile.PL PREFIX="%{_prefix}" @@ -87,6 +72,8 @@ code. # remove .packlist file %__rm -rf "%{buildroot}%{perl_vendorarch}/auto/ack" +%__rm -f "%{buildroot}/var/adm/perl-modules/ack" + #%__install -D -m0644 etc/ack.bash_completion.sh \ # "%{buildroot}/%{_sysconfdir}/bash_completion.d/%{name}.sh" @@ -116,4 +103,4 @@ done %{perl_vendorlib}/App/Ack %if 0%{?perl_process_packlist:1} %endif -%changelog +