From b20f2b1c0c8960b41b216a3ac9bc7b8da2c3c4100560baf1b5854b3c01bc05ee Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 10 Jan 2020 09:55:01 +0000 Subject: [PATCH] Accepting request 762159 from home:dancermak:branches:utilities Remove /usr/bin/env rpmlint errors OBS-URL: https://build.opensuse.org/request/show/762159 OBS-URL: https://build.opensuse.org/package/show/utilities/gnu_parallel?expand=0&rev=115 --- gnu_parallel-rpmlintrc | 3 +++ gnu_parallel.changes | 10 ++++++++++ gnu_parallel.spec | 16 ++++++++++------ 3 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 gnu_parallel-rpmlintrc 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..d68fb84 100644 --- a/gnu_parallel.changes +++ b/gnu_parallel.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +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..ece6fc0 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 @@ -22,10 +22,10 @@ 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 Patch0: parallel-remove-nag-screen.patch BuildArch: noarch @@ -50,8 +50,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 +60,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*