up to 1.6.0 (15 March 2015)

[packages/pv.git] / pv.spec

diff --git a/pv.spec b/pv.spec
index 801afca23ce341db091629b1afc066601ba2e2d0..f735d21574c7aa238a086cdcb74480467000ba61 100644 (file)
--- a/pv.spec
+++ b/pv.spec
@@ -1,15 +1,20 @@
+#
+# Conditional build:
+%bcond_without tests           # build without tests
+
 Summary:       Pipe Viewer - tool for monitoring the progress of data through a pipeline
 Summary(pl.UTF-8):     Pipe Viewer - monitorowanie przepływu danych przez potok
 Name:          pv
-Version:       1.1.4
+Version:       1.6.0
 Release:       1
 License:       Artistic v2.0
 Group:         Applications
-Source0:       http://dl.sourceforge.net/pipeviewer/%{name}-%{version}.tar.gz
-# Source0-md5: 8d0eda2182640919daaf6186cd816a13
+Source0:       http://www.ivarch.com/programs/sources/%{name}-%{version}.tar.bz2
+# Source0-md5: e163d8963c595b2032666724bc509bcc
 URL:           http://www.ivarch.com/programs/pv.shtml
-BuildRequires: autoconf
-BuildRequires: gettext-devel
+BuildRequires: gettext-tools
+# the unit tests call usleep(1)
+BuildRequires: rc-scripts
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,17 +35,12 @@ mniej więcej czasu to będzie trwało.
 %setup -q
 
 %build
-cd autoconf
-%{__autoconf}
-cd ..
-install autoconf/configure .
 %configure
 %{__make}
+%{?with_test:%{__make} test}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,%{_infodir}}
-
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
@@ -52,5 +52,5 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README doc/NEWS doc/TODO
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/pv
+%{_mandir}/man1/pv.1*