diff --git a/gnu_parallel-rpmlintrc b/gnu_parallel-rpmlintrc new file mode 100644 index 0000000..545c068 --- /dev/null +++ b/gnu_parallel-rpmlintrc @@ -0,0 +1,3 @@ +# env_parallel and parset are intended to be sourced and *not* executed directly +addFilter(".*env-script-interpreter.*/usr/bin/env_parallel.*") +addFilter(".*env-script-interpreter.*/usr/bin/parset") diff --git a/gnu_parallel.changes b/gnu_parallel.changes index c70920c..ae8dfb1 100644 --- a/gnu_parallel.changes +++ b/gnu_parallel.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Mon Mar 23 10:23:12 UTC 2020 - Jan Engelhardt + +- Update to release 20200322 + * Bug fixes and man page updates. + +------------------------------------------------------------------- +Mon Mar 16 09:36:27 UTC 2020 - Jan Engelhardt + +- Update to release 20200222 + * --blocktimeout dur - Time out for reading block when using + --pipe. If it takes longer than dur to read a full block, use + the partial block read so far. + +------------------------------------------------------------------- +Fri Jan 10 09:56:23 UTC 2020 - Jan Engelhardt + +- Update to release 20191222 + * No new functionality was introduced. + +------------------------------------------------------------------- +Thu Jan 9 11:14:31 UTC 2020 - Dan Čermák + +- Remove /usr/bin/env rpmlint errors: + * fix shebang in %{_bindir}/parallel + * add rpmlint filters for env_parallel.* and parset, as these are not intended + to be executed +- Change URLs to use https instead of http + ------------------------------------------------------------------- Mon Oct 28 12:51:56 UTC 2019 - Ismail Dönmez diff --git a/gnu_parallel.spec b/gnu_parallel.spec index 8420e77..9007e84 100644 --- a/gnu_parallel.spec +++ b/gnu_parallel.spec @@ -1,7 +1,7 @@ # # spec file for package gnu_parallel # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,16 +17,17 @@ Name: gnu_parallel -Version: 20191022 +Version: 20200322 Release: 0 Summary: Shell tool for executing jobs in parallel License: GPL-3.0-or-later Group: Productivity/File utilities -Url: http://www.gnu.org/software/parallel/ +URL: https://www.gnu.org/software/parallel/ #DL-URL: http://ftp.gnu.org/gnu/parallel/ -Source: http://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2 -Source2: http://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2.sig +Source: https://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2 +Source2: https://ftp.gnu.org/gnu/parallel/parallel-%version.tar.bz2.sig Source3: %name.keyring +Source9: %name-rpmlintrc Patch0: parallel-remove-nag-screen.patch BuildArch: noarch @@ -50,8 +51,7 @@ or more computers. This subpackage contains the documentation for Parallel. %prep -%setup -q -n parallel-%version -%patch0 -p1 +%autosetup -n parallel-%version -p1 %build %configure --docdir="%_docdir/%name" @@ -61,6 +61,11 @@ make %{?_smp_mflags} %make_install cp -a CITATION NEWS README cc-by-sa.txt fdl.txt "%buildroot/%_docdir/%name/" +# fix shebang to to not use env & preserve the time stamps +sed -i.orig "s:^#\!/usr/bin/env\s\+perl\s\?$:#!%__perl:" "%buildroot/%_bindir/parallel" +touch -r "%buildroot/%_bindir/parallel.orig" "%buildroot/%_bindir/parallel" +rm "%buildroot/%_bindir/parallel.orig" + %files %license COPYING %_bindir/env_parallel* diff --git a/parallel-20191022.tar.bz2 b/parallel-20191022.tar.bz2 deleted file mode 100644 index 9c0224d..0000000 --- a/parallel-20191022.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:641beea4fb9afccb1969ac0fb43ebc458f375ceb6f7e24970a9aced463e909a9 -size 2080361 diff --git a/parallel-20191022.tar.bz2.sig b/parallel-20191022.tar.bz2.sig deleted file mode 100644 index eed43f8..0000000 --- a/parallel-20191022.tar.bz2.sig +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -# To check the signature run: -# echo | gpg -# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20191022.tar.bz2.sig - -echo | gpg 2>/dev/null -gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 -exit $? - ------BEGIN PGP SIGNATURE----- - -iQUHBAABCgAdFiEEzaAaQgjE90UGEH570atFFoiIiIgFAl2uAyAACgkQ0atFFoiI -iIioYiaguxZ2ipy6ZoOY2ma5cZNj8Ar0wfsPdxFL0eMQQreXokBAt0AdqJiwitys -SWLXvtmbKPNWn1wrQONnlimPKApcbyWXByJVUL+9cU0aW20rgUpJ7jPlidQ8nPrE -fC+QCbs3H5YKMDftokzWWesnIoU5jZ9TllfJsnG+RW6Cu8CqwBA29VC+AP4rH9I1 -M0uI/7eSr7QTonUcb2ZJPYY6yV6Wzc6udfonDaQT1imHbJeaSqr8n0E0S9kdkvrw -FIU5bG3XH+kuSGg+i3AlzloAfptXJ0QQGxpDfeIsQ5Z0fAkU8bCOJ4CPGqa54kX/ -5a+r+qh3Ju+jf4QQNEsHi3z6FzaiJZMliPnnyUwXSbifZQWiP64LLrYKY7bufqSK -MCrUqxfla7GQ6GtWSnNPU6ELtF6buql0SIB/vfp3AtDtqQYIC8sjBkt936z8Odhm -aoXFPreXYNKoOdEag31ICsbuQ/ZNGoVLKuPj1mqG/Am4+Z4j102NrEiJu1Lq/Sil -VDMGLpwJLT396vRfRAzRtJMlH0ZeYBpdcdh5KmMDc8iQQVyT1s98CD/0UwGI4MGG -lGM720CDZNOCv6beDtBw9oHR4R4bTJPXA4EbLxGlP4OKRgalDZvqvm/8fCmcbSm/ -BZo+Gm268Soaf3EOrfWPXzT0dctyFgtLpxM7g4kXRp0P7P6tNNJEnhu4C4hMQz/7 -nOGjWB2yFJAlkIp7puTmVgq19qYsq2E/j4IHKFpERXL5XniOM0lQHp0+EeB9hkU5 -OeFB3q4NSNAYwEmVo0NAVSvcWUa9a7ewf5qm3IiUu9X8zJmLyQbHknUiA6s1fySB -xMZbQtvBYhdBAIqhhC0OJSEW9LX7zY0NkdIyc29XIrR/ucOGiftkT2y02CKQriwj -PPdD66PPB/7uBDAqJEkBAcwSUeR+DfXsFMWJrjE3+8bwnbzSp0J1nt2ApRaiRXDf -qatdlJRTE/EsZnEo5ZEfNi34FV78U1ZJN3xB5Gy5vtwv5N84r9hUyuNrAyHt7tKc -iRkTKf+o/UaWGRe48voFQuP//MQ3xKLteRNi5Gz6oQuPJRtunwI5rGaVfD4okgfa -Q6mwR3JO1xlW5cGQUS5ARCRnVunWae5SQFV1bojla4SiJ4VIuqdj2DnFUxX72EUl -s0n/dRNh/2/g+IPXAgDQ4AkC/mzdXuxi6oxqV1GdX73o36Uo48p1qNirU6hvDoz/ -lfuY4ZgkwxGWYpMm83VmIPM1Nb/8ekK/CB52ajfDY2y8b1tH1P7s1acOc0TW7kRf -9qE03CsiEtvldXPofRABnFm/62FeyrZDG4hBVgpkHcBi/dSAya5tWyC/5XaAd3FY -AyhANfOERYbOJTHvK+JJsKNoLcmJulTUHDmdfdvs0cw+JuGdjr52p1tv1glSk3eA -YJhfO7uILBDzboLkCtqnD/c+D5agSX9vVhe6qjRwmYhzvQQ1WTkHPO/kR91ueKEL -fMvdgpfUoy2ztSYwHPaEWNSuZherid8Blr22G+JNjWYC3+nU6P51DyyggYFHr48T -clnoZnlcHcgw3i4M3aW9SdZ12EWSzKdwJcJeLXED9VsiNxHrLl0cM/YQMBtlrBbX -mvms9ESH3fSoHwMHTtejaPSnA3PPGoseuaEBqbFB0S/R/Oxo8yYW7tK/ -=s2Yt ------END PGP SIGNATURE----- diff --git a/parallel-20200322.tar.bz2 b/parallel-20200322.tar.bz2 new file mode 100644 index 0000000..2a8af76 --- /dev/null +++ b/parallel-20200322.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:207484e124860e215cc3e4d7aff48b3b1c4376c95b3c7c7888453c67e92be94d +size 2060096 diff --git a/parallel-20200322.tar.bz2.sig b/parallel-20200322.tar.bz2.sig new file mode 100644 index 0000000..e6d28a4 --- /dev/null +++ b/parallel-20200322.tar.bz2.sig @@ -0,0 +1,41 @@ +#!/bin/bash + +# To check the signature run: +# echo | gpg +# gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve parallel-20200322.tar.bz2.sig + +echo | gpg 2>/dev/null +gpg --auto-key-locate keyserver --keyserver-options auto-key-retrieve $0 +exit $? + +-----BEGIN PGP SIGNATURE----- + +iQUHBAABCgAdFiEEzaAaQgjE90UGEH570atFFoiIiIgFAl52dgsACgkQ0atFFoiI +iIhiLSaeNdDScW9TjJZPjlP+mkmmjExahxoV3M27ZkOYCiixDA3Wos57+kogwxmv +KQmtt8KSaTHRTLUUmp2/9GOidasxH8X9ZgrwS/U5T8Hz2rua5bNceHUXLPTjW4oE +wWEfErcOetMGA1P+H1OsgYKMS3b0FsvFfos9058DS6J3d6o1JOpB7z82yWkLx4Vn +IUJZaDbUbKsdtjcLqEz9RK5Zp5nmzYHyt1F0RxNjMLp7L5m5kwI94MnaDf9gOl8i +XiE77lCN5uSUMNOsBMWsNLhOqvQSQEzSKXNWT2SGYHNqlC8MEakG0wfBOU/9Ye1D +zLrcRe8kevRtAcael5KGR3Jhaaxtl/66VGrbiu8a5ayWGAzJZViQg4g9YHIncE/O +d1EIELlQRsfx+GlUOYxEHqdoXOX8T69uIUCnOh1voo5EJ7+vhocwmi3X9dxA/+ys +oN8bym6BPAMgsGXN7msaVIJTYKJPK681Fl3rng0TDkG16IOdoqg24KXnRNhVqg7f +lH4VWFFh+e+BIeY2uGfDCMJOIPiwOrdatW+gihL+oI+G8PjHs0no806uOoy15kq9 +YQaR8BG4tD2GFNPOjW/I2BsnTWGBpskmcP4BE3jUCPvJy/0rekFEaOY4CojST03P +yDXXR06Iq8Kl2bUQfl6dUU5sbLE/E7EkZKGSg/yrnbsE+N4jXXmjiTw+ACQlgGeQ +hieEmr6zhFi4krogXaSU6gVYqTHUttiHomtPdo9hcp0jCt+NxeyAPcVTxA1Osvkg +rgLu9v40cZA5+XpwgmFvGOVJ94LKc2l1SjEJEdspYXtEMt/EWavztVWO0/bkS+Cb +ihqH5MI+gz1WIRXeStgsGMoKeHm+vj3zn9kBo04HQ3R28im0jFFV7NAqIy75xzwp +ruQb1aJrhfElTWjG3Tri60Ig038tnJ37+3H+t+SArhtsTxSwy1Nc8scYq4oq4DSo +8P7Vevo8XwbRtCtTnxwZIW19DO9imtx/2Gh2cjPyAefcwtnWnaw/dni+f3h9bmHK +w93MypnXIquIY1TOZYcSaf2Vstip8hQhJpfVLdKBwTkdmvwjT1zx0j0MK6O5mUZ9 +9QCy9q74x2zbwrOzYM++RvU1KwNJvpBbKyAkUFq0uV5ElTTlDVog37iKlQ0vdEyU +A5Z4tRj/cvcKpDXPUKKnHjIJ893vXZbDyoNvbiE4pYbszFMYB84vcZYGSn0xlVJt +R+IL2w5Ib4af3suED0dtiTUP3XDQwbCUfzsNYKsAXK4a/4tfdC4zvV6h/a78tKE8 +KvzHU5KHqWBj/doedarfVkCidm/6upU9bA6JVyRFAY4ByIkZO3utDUFQN+BUEcyT +YHASmRt2lBXQ987mRSNKZ+ikGWdNsKutHtfhIglI1Z3stnjGGr6yP2x/XZYyGRGx +bteZDkOzeFhpztlsSptHwu0aQBk+Fe0Re7yNNXTH3j+eAbo5EOVg6cvOqmWVL2M6 +xRtOJDr+jK9yH1F/e0lWPwcZ72es68kx6S854/qg+0RwzzlIApHpTHrzJvn+D0NY +tEQFs/GM4X06eAi881V8AAyggXVdTRCH9uOq6L6HeDq1wuSWPu+S4FZGs8HRPHw7 +TlRdtA9Fdb9jE+XLMBmowADhgptXgIrRpiOPgD0SLjrlUmjMCWoaj3UA +=pBPd +-----END PGP SIGNATURE----- diff --git a/parallel-remove-nag-screen.patch b/parallel-remove-nag-screen.patch index f0264c9..6b2b709 100644 --- a/parallel-remove-nag-screen.patch +++ b/parallel-remove-nag-screen.patch @@ -1,26 +1,36 @@ -Index: parallel-20191022/src/parallel +From: Dan Cermak +Date: + +--- + src/parallel | 2 ++ + src/sem | 2 ++ + 2 files changed, 4 insertions(+) + +Index: parallel-20191222/src/parallel =================================================================== ---- parallel-20191022.orig/src/parallel -+++ parallel-20191022/src/parallel -@@ -1949,7 +1949,7 @@ sub parse_options(@) { +--- parallel-20191222.orig/src/parallel ++++ parallel-20191222/src/parallel +@@ -1949,7 +1949,9 @@ sub parse_options(@) { # # If you want GNU Parallel to be maintained in the future keep # this line. -- citation_notice(); -+ #citation_notice(); - # Seriously: YOU will be harming free software by removing the ++ if (0) { + citation_notice(); ++ } + # Seriously: *You* will be harming free software by removing the # notice. You make it harder to justify spending time developing # it. If you *do* remove the line, please email -Index: parallel-20191022/src/sem +Index: parallel-20191222/src/sem =================================================================== ---- parallel-20191022.orig/src/sem -+++ parallel-20191022/src/sem -@@ -1949,7 +1949,7 @@ sub parse_options(@) { +--- parallel-20191222.orig/src/sem ++++ parallel-20191222/src/sem +@@ -1949,7 +1949,9 @@ sub parse_options(@) { # # If you want GNU Parallel to be maintained in the future keep # this line. -- citation_notice(); -+ #citation_notice(); - # Seriously: YOU will be harming free software by removing the ++ if (0) { + citation_notice(); ++ } + # Seriously: *You* will be harming free software by removing the # notice. You make it harder to justify spending time developing # it. If you *do* remove the line, please email