diff --git a/.gitignore b/.gitignore index 64aeb2a..135b788 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /parallel-20131222.tar.bz2 /parallel-20141122.tar.bz2 /parallel-20160222.tar.bz2 +/parallel-20160722.tar.bz2 diff --git a/parallel-20160222.tar.bz2 b/parallel-20160222.tar.bz2 deleted file mode 100644 index 138758a..0000000 Binary files a/parallel-20160222.tar.bz2 and /dev/null differ diff --git a/parallel.spec b/parallel.spec index d9c5b55..dfde53c 100644 --- a/parallel.spec +++ b/parallel.spec @@ -1,19 +1,22 @@ -Summary: Shell tool for executing jobs in parallel -Name: parallel -Version: 20160222 -Release: 1%{?dist} -License: GPLv3+ -Group: Applications/Productivity -URL: http://www.gnu.org/software/parallel/ -Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 -BuildArch: noarch -BuildRequires: perl-generators +Name: parallel +Summary: Shell tool for executing jobs in parallel +Version: 20160722 +Release: 1%{?dist} + +License: GPLv3+ +URL: http://www.gnu.org/software/parallel/ +Source0: http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2 + +BuildArch: noarch + +BuildRequires: perl-generators +BuildRequires: %{_bindir}/pod2man # Due to a naming conflict, both packages cannot be installed in parallel # To prevent user confusion, GNU parallel is installed in a compatibility # mode to be commandline compatible to moreutils' parallel. # This mode can be turned off system wide or on a per-user base. -Conflicts: moreutils-parallel +Conflicts: moreutils-parallel %description GNU Parallel is a shell tool for executing jobs in parallel using one or more @@ -34,42 +37,40 @@ GNU Parallel is command-line-compatible with moreutils' parallel, but offers additional features. %prep - -%setup -q +%autosetup %build - %configure -make %{?_smp_mflags} +%make_build %install - -make install DESTDIR=%{buildroot} - -find %{buildroot} -iname "*.html" -delete -find %{buildroot} -iname "*.texi" -delete -find %{buildroot} -iname "*.pod" -delete -find %{buildroot} -iname "*.pdf" -delete -mv %{buildroot}%{_mandir}/man1/sql.1 %{buildroot}%{_mandir}/man1/parallel-sql.1 +%make_install +rm -vrf %{buildroot}%{_pkgdocdir} +sed -i -e '1s|!/usr/bin/env perl|#!%{__perl}|' %{buildroot}%{_bindir}/* +# FIXME: do it properly +sed -i -e '1{\@^#!@d}' %{buildroot}%{_bindir}/env_parallel.* +chmod -x %{buildroot}%{_bindir}/env_parallel.* %files - +%license COPYING +%doc README NEWS %{_bindir}/parallel +%{_mandir}/man1/parallel.1* +%exclude %{_bindir}/env_parallel* +%exclude %{_mandir}/man1/env_parallel.1* %{_bindir}/sem +%{_mandir}/man1/sem.1* %{_bindir}/sql +%{_mandir}/man1/sql.1* %{_bindir}/niceload -%{_mandir}/man*/niceload.*.* -%{_mandir}/man*/parallel.*.* -%{_mandir}/man*/sem.*.* -%{_mandir}/man*/parallel-sql.*.* -%{_mandir}/man*/parallel_tutorial.*.* -%{_mandir}/man*/parallel_design.*.gz - -%doc README NEWS COPYING src/parallel.html src/sem.html src/sql.html -%doc src/niceload.html src/*.texi -%doc src/niceload.pdf src/parallel.pdf src/parallel_tutorial.pdf src/sem.pdf src/sql.pdf +%{_mandir}/man1/niceload.1* +%{_mandir}/man7/parallel_tutorial.7* +%{_mandir}/man7/parallel_design.7* %changelog +* Sun Aug 21 2016 Igor Gnatenko - 20160722-1 +- Update to 20160722 + * Mon Apr 04 2016 Golo Fuchert 20160222-1 - Update to version 20160222-1 to fix bugs (#1285888,1307846,1320511,1320956,1320958) diff --git a/sources b/sources index 3b4f0be..e6414fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f2c0a3c51fac6aaf11babe31fc5a5c0 parallel-20160222.tar.bz2 +7c0462c43a93e717766dbe156cf7c24d parallel-20160722.tar.bz2