summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2022-07-14 14:30:54 (GMT)
committerJakub Bogusz2022-07-14 14:30:54 (GMT)
commitb3fafaa83b65ef6461f4cd6a38ae11a5d5d7378a (patch)
treeeb34e9faeb4f244bb82f0df8ca02f761e037efbb
parentc19fcd3f6a3df300eba1d908ed6195fa14cdd635 (diff)
downloadparallel-b3fafaa83b65ef6461f4cd6a38ae11a5d5d7378a.zip
parallel-b3fafaa83b65ef6461f4cd6a38ae11a5d5d7378a.tar.gz
- updated to 20220622auto/th/parallel-20220622-1
- added destdir patch (fix completions installation to DESTDIR and without parallel installed to PATH)
-rw-r--r--parallel-destdir.patch22
-rw-r--r--parallel.spec40
2 files changed, 60 insertions, 2 deletions
diff --git a/parallel-destdir.patch b/parallel-destdir.patch
new file mode 100644
index 0000000..05ae3fa
--- /dev/null
+++ b/parallel-destdir.patch
@@ -0,0 +1,22 @@
+--- parallel-20220622/Makefile.am.orig 2022-06-22 08:06:29.000000000 +0200
++++ parallel-20220622/Makefile.am 2022-07-14 16:08:14.135641070 +0200
+@@ -170,12 +170,12 @@ pack_unpack_and_test_build:
+ zshcompletiondir=${datarootdir}/zsh/site-functions
+ zshcompletion=${zshcompletiondir}/_parallel
+ install-data-hook:
+- mkdir -p ${datarootdir}/bash-completion/completions
+- mkdir -p ${zshcompletiondir}
+- parallel --shell-completion bash > ${datarootdir}/bash-completion/completions/parallel
+- echo '#compdef parallel' > ${zshcompletion}
+- echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
+- echo ' eval "$$(parallel --shell-completion auto)" &&' >> ${zshcompletion}
+- echo ' _comp_parallel' >> ${zshcompletion}
++ mkdir -p $(DESTDIR)${datarootdir}/bash-completion/completions
++ mkdir -p $(DESTDIR)${zshcompletiondir}
++ $(DESTDIR)$(bindir)/parallel --shell-completion bash > $(DESTDIR)${datarootdir}/bash-completion/completions/parallel
++ echo '#compdef parallel' > $(DESTDIR)${zshcompletion}
++ echo '(( $$+functions[_comp_parallel] )) ||' >> $(DESTDIR)${zshcompletion}
++ echo ' eval "$$($(DESTDIR)$(bindir)/parallel --shell-completion auto)" &&' >> $(DESTDIR)${zshcompletion}
++ echo ' _comp_parallel' >> $(DESTDIR)${zshcompletion}
+
+ EXTRA_DIST = CITATION CITATION.cff CREDITS LICENSES/CC-BY-SA-4.0.txt LICENSES/GFDL-1.3-or-later.txt LICENSES/GPL-3.0-or-later.txt
diff --git a/parallel.spec b/parallel.spec
index ba2202a..95f246b 100644
--- a/parallel.spec
+++ b/parallel.spec
@@ -1,12 +1,13 @@
Summary: Shell tool for executing jobs in parallel
Summary(pl.UTF-8): Narzędzie powłoki do równoległego uruchamiania zadań
Name: parallel
-Version: 20220122
+Version: 20220622
Release: 1
License: GPL v3+
Group: Applications/System
Source0: https://ftp.gnu.org/gnu/parallel/%{name}-%{version}.tar.bz2
-# Source0-md5: ae4a8b2e93a78dad741564a92bc024c6
+# Source0-md5: 6b189242185b5b550ce98c9cf88bdd27
+Patch0: %{name}-destdir.patch
URL: https://www.gnu.org/software/parallel/
BuildRequires: perl-tools-pod
BuildRequires: rpm-perlprov
@@ -69,8 +70,35 @@ to GNU Parallel.
env_parallel to funkcja powłoki eksportująca bieżące środowisko do
GNU Parallel.
+%package -n bash-completion-parallel
+Summary: Bash completion for parallel commands
+Summary(pl.UTF-8): Bashowe uzupełnianie poleceń parallel
+Group: Applications/Shells
+Requires: %{name} = %{version}-%{release}
+Requires: bash-completion >= 1:2.0
+
+%description -n bash-completion-parallel
+Bash completion for parallel commands.
+
+%description -n bash-completion-parallel -l pl.UTF-8
+Bashowe uzupełnianie poleceń parallel.
+
+%package -n zsh-completion-parallel
+Summary: Zsh completion for parallel commands
+Summary(pl.UTF-8): Uzupełnianie poleceń parallel w Zsh
+Group: Applications/Shells
+Requires: %{name} = %{version}-%{release}
+Requires: zsh
+
+%description -n zsh-completion-parallel
+Zsh completion for parallel commands.
+
+%description -n zsh-completion-parallel -l pl.UTF-8
+Uzupełnianie poleceń parallel w Zsh.
+
%prep
%setup -q
+%patch0 -p1
%{__sed} -i -e '1s,^#!.*perl,#!%{__perl},' src/{parallel,sem}
%{__sed} -i -e '1{\@^#!@d}' src/env_parallel.*
@@ -133,3 +161,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/env_parallel.tcsh
%attr(755,root,root) %{_bindir}/env_parallel.zsh
%{_mandir}/man1/env_parallel.1*
+
+%files -n bash-completion-parallel
+%defattr(644,root,root,755)
+%{bash_compdir}/parallel
+
+%files -n zsh-completion-parallel
+%defattr(644,root,root,755)
+%{zsh_compdir}/_parallel