X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ack.spec;h=f1f631138304f853767d58787e35c561a9852eb1;hb=HEAD;hp=84c2f130892c3df8305fa6b22137dcf5c01ef835;hpb=7c7302016692aa20273612042c0eced7713a86c2;p=packages%2Fack.git

diff --git a/ack.spec b/ack.spec
index 84c2f13..f1f6311 100644
--- a/ack.spec
+++ b/ack.spec
@@ -1,25 +1,32 @@
+# TODO:
+# - split /usr/share/perl* part into perl-ack subpackage
 #
 # Conditional build:
 %bcond_without	tests		# do not perform "make test"
+%bcond_with	pty_tests	# do not perform tests requiring a pty
 #
-%include	/usr/lib/rpm/macros.perl
 %define	pdir	ack
 Summary:	grep-like text finder
 Summary(pl.UTF-8):	produkt grepopodobny
-Name:		perl-ack
-Version:	1.92
+Name:		ack
+Version:	2.28
 Release:	1
 License:	GPL v1+ or Artistic
 Group:		Development/Languages/Perl
-Source0:	http://www.cpan.org/modules/by-authors/id/P/PE/PETDANCE/ack-%{version}.tar.gz
-# Source0-md5:	c25b5a16d0a27386a75c91d531b86cea
+Source0:	http://www.cpan.org/modules/by-authors/id/P/PE/PETDANCE/%{name}-%{version}.tar.gz
+# Source0-md5:	5c363d701cb40cbc3806441b2a887b43
+Patch0:		%{name}-deps.patch
+Patch1:		%{name}-interactive-tests.patch
 URL:		http://betterthangrep.com/
-BuildRequires:	perl-File-Next
-%{?with_tests:BuildRequires:	perl-Test-Pod}
+Requires:	perl-ack = %{version}
+%if %{with tests}
+BuildRequires:	perl-File-Next >= 1.16
+%{?with_pty_tests:BuildRequires:	perl-IO-Tty}
+BuildRequires:	perl-Test-Simple >= 0.98
+%endif
 BuildRequires:	perl-devel >= 1:5.8.0
 BuildRequires:	perl-perldoc
 BuildRequires:	rpm-perlprov >= 4.1-13
-Obsoletes:	perl-ack
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -34,15 +41,28 @@ Ack can also list files that would be searched, without actually
 searching them, to let you take advantage of ack's file-type filtering
 capabilities.
 
-%description -l pld.UTF-8
+%description -l pl.UTF-8
 ack jest narzędziem podobnym do grepa, zaprojektowanym dla
 programistów pracujących z dużymi drzewami różnorodnych plików.
 
-ack jest napisane w czystym Perlu i korzysta z ptęgi wyrażeń
-regularnych języka Perl.
+ack jest napisany w czystym perlu i korzysta z potęgi wyrażeń
+regularnych tego języka.
+
+%package -n perl-ack
+Summary:	ack perl library
+Summary(pl.UTF-8):	biblioteka ack dla języka perl
+Group:		Development/Languages/Perl
+
+%description -n perl-ack
+ack perl library.
+
+%description -n perl-ack -l pl.UTF-8
+ack perl library.
 
 %prep
 %setup -q -n %{pdir}-%{version}
+%patch0 -p0
+%patch1 -p0
 
 %build
 %{__perl} Makefile.PL \
@@ -51,7 +71,7 @@ regularnych języka Perl.
 	CC="%{__cc}" \
 	OPTIMIZE="%{rpmcflags}"
 
-%{?with_tests:%{__make} test}
+%{?with_tests:%{!?with_pty_tests: RUN_INTERACTIVE=0} %{__make} -j1 test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,8 +84,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc Changes README TODO ack-help.txt ack-help-types.txt
+%doc Changes README.md
 %attr(755,root,root) %{_bindir}/ack
+%{_mandir}/man1/ack.1p*
+
+%files -n perl-ack
+%defattr(644,root,root,755)
 %{perl_vendorlib}/App/Ack.pm
 %{perl_vendorlib}/App/Ack
-%{_mandir}/man1/ack.1p*