redo ack-ignore-osc.patch against 1.92

OBS-URL: https://build.opensuse.org/package/show/utilities/ack?expand=0&rev=2

ack-ignore-osc.patch

@@ -0,0 +1,20 @@
+--- ack.orig	2010-11-11 23:59:24.000000000 +0100
++++ ack	2010-11-11 23:59:38.000000000 +0100
+@@ -1138,6 +1138,7 @@
+         '~.plst'            => 'Interface Builder',
+         '.git'              => 'Git',
+         '.hg'               => 'Mercurial',
++        '.osc'              => 'openSUSE Commander',
+         '.pc'               => 'quilt',
+         '.svn'              => 'Subversion',
+         blib                => 'Perl module building',
+--- Ack.pm.orig	2010-11-11 23:59:08.000000000 +0100
++++ Ack.pm	2010-11-11 23:59:21.000000000 +0100
+@@ -57,6 +57,7 @@
+         '~.plst'            => 'Interface Builder',
+         '.git'              => 'Git',
+         '.hg'               => 'Mercurial',
++        '.osc'              => 'openSUSE Commander',
+         '.pc'               => 'quilt',
+         '.svn'              => 'Subversion',
+         blib                => 'Perl module building',

ack.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 11 23:00:39 UTC 2010 - pascal.bleser@opensuse.org
+
+- applied patch by Pavol Rusnak <prusnak@suse.cz> from openSUSE:Factory:Contrib/ack to ignore .osc directories (redone for release 1.92)
+
+- merged .changes entries for 1.92 by Petr Uzl <puzel@suse.cz> from openSUSE:Factory:Contrib/ack, he was a lot less lazy than me
+
 -------------------------------------------------------------------
 Sun Feb 14 22:09:12 UTC 2010 - pascal.bleser@opensuse.org
 
@@ -6,7 +13,23 @@ Sun Feb 14 22:09:12 UTC 2010 - pascal.bleser@opensuse.org
 -------------------------------------------------------------------
 Sun Feb 14 21:53:01 UTC 2010 - pascal.bleser@opensuse.org
 
-- update to 1.92
+- update to 1.92:
+ [ENHANCEMENTS]
+  * Added Scala support.  Thanks to Dan Sully.
+  * Added .phtml as an extension for PHP.
+  * Using -f or -g now return a proper error code.  If files are
+    found, ack returns 0.  If none are found, ack returns 1.  This
+    is a change in the specification, but the code didn't match the
+    specfication anyway.
+  * No man pages are created for any of the .pm files any more.
+ [FIXES]
+  * The --pager flag would not work.  Now it does.  Thanks Packy
+    Anderson.
+  * File matching for Emacs work files that match #*# was wrong.
+    It was checking the entire path, not just the basename.  This
+    is fixed.  (http://github.com/petdance/ack/issues/closed/#issue/101)
+  * Fixed URLs that pointed to old Google Code.
+
 - split out perl-App-Ack into its own subpackage
 
 -------------------------------------------------------------------
@@ -25,12 +48,11 @@ Mon Jul 13 00:00:00 UTC 2009 - pascal.bleser@opensuse.org
 -------------------------------------------------------------------
 Wed Jul 16 00:00:00 UTC 2008 - guru@unixtech.be
 
-- new upstream version
+- new upstream version (1.86)
-
 
 -------------------------------------------------------------------
 Tue Mar 25 00:00:00 UTC 2008 - guru@unixtech.be
 
-- new package
+- new package (1.78)
 
 

ack.spec

@@ -1,20 +1,21 @@
-# norootforbuild
+# vim: set ts=4 sw=4 et:
 
-Name:			ack
+Name:           ack
-Version:		1.92
+Version:        1.92
 Release:		0
-Summary:		Grep-Like Text Finder
+Summary:        Grep-Like Text Finder
-Source:			http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/ack-%{version}.tar.gz
+Source:         http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/ack-%{version}.tar.gz
-URL:			http://petdance.com/ack/
+Patch1:         ack-ignore-osc.patch
-Group:			Productivity/Text/Utilities
+URL:            http://petdance.com/ack/
-License:		Perl License
+Group:          Productivity/Text/Utilities
-BuildRoot:		%{_tmppath}/build-%{name}-%{version}
+License:        Perl License
-Requires:		perl
+BuildRoot:      %{_tmppath}/build-%{name}-%{version}
-BuildRequires:	make perl perl-File-Next
+Requires:       perl
+BuildRequires:  make perl perl-File-Next
 %if 0%{?suse_version} > 0 && 0%{?suse_version} >= 1020
 BuildRequires:  perl-Test-Pod
 %endif
-BuildArch:		noarch
+BuildArch:      noarch
 Requires:       perl-App-Ack = %{version}-%{release}
 Requires:       perl-base = %{perl_version}
 
@@ -29,8 +30,8 @@ Authors:
     Andy Lester <andy@petdance.com>
 
 %package -n perl-App-Ack
-Summary:		Grep-Like Text Finder Perl Module
+Summary:        Grep-Like Text Finder Perl Module
-Group:			Development/Libraries/Perl
+Group:          Development/Libraries/Perl
 Requires:       perl-base = %{perl_version}
 
 %description -n perl-App-Ack
@@ -39,6 +40,7 @@ code.
 
 %prep
 %setup -q -n "ack-%{version}"
+%patch1
 
 %build
 %__perl Makefile.PL PREFIX="%{_prefix}"
@@ -48,6 +50,9 @@ code.
 %perl_make_install
 %perl_process_packlist
 
+# remove .packlist file
+%__rm -rf "%{buildroot}%{perl_vendorarch}/auto/ack"
+
 #%__install -D -m0644 etc/ack.bash_completion.sh \
 #    "%{buildroot}/%{_sysconfdir}/bash_completion.d/%{name}.sh"
 
@@ -60,7 +65,7 @@ done
 %__make test
 
 %clean
-%__rm -rf "%{buildroot}"
+%{?%__rm -rf "%{buildroot}"}
 
 %files
 %defattr(-,root,root)
@@ -75,11 +80,5 @@ done
 %dir %{perl_vendorlib}/App
 %{perl_vendorlib}/App/Ack.pm
 %{perl_vendorlib}/App/Ack
-%{perl_vendorarch}/auto/ack
 /var/adm/perl-modules/%{name}
 
-%changelog
-# Local Variables:
-# mode: rpm-spec
-# tab-width: 3
-# End: