Date: Friday, June 24, 2022 @ 03:14:58
Author: grawlinson
Revision: 1239315
upgpkg: parallel 20220622-1
* New upstream release.
* Add destdir support to Makefile.
Added:
parallel/trunk/0002-Fix-makefile.patch
Modified:
parallel/trunk/0001-Remove-citation-things.patch
parallel/trunk/PKGBUILD
-----------------------------------+
0001-Remove-citation-things.patch | 30 ++++++++++++++----------------
0002-Fix-makefile.patch | 23 +++++++++++++++++++++++
PKGBUILD | 16 +++++++++++-----
3 files changed, 48 insertions(+), 21 deletions(-)
Modified: 0001-Remove-citation-things.patch
===================================================================
--- 0001-Remove-citation-things.patch 2022-06-24 02:50:39 UTC (rev 1239314)
+++ 0001-Remove-citation-things.patch 2022-06-24 03:14:58 UTC (rev 1239315)
@@ -1,5 +1,3 @@
-diff --git a/src/parallel b/src/parallel
-index 551c066..eb4819e 100755
--- a/src/parallel
+++ b/src/parallel
@@ -1920,11 +1920,6 @@ sub options_completion_hash() {
@@ -112,7 +110,7 @@
parse_halt();
if($ENV{'PARALLEL_ENV'}) {
-@@ -5507,85 +5418,9 @@ sub usage() {
+@@ -5521,85 +5432,9 @@ sub usage() {
"",
"GNU Parallel can do much more. See 'man $Global::progname' for
details",
"",
@@ -120,8 +118,8 @@
- "If you use programs that use GNU Parallel to process data for an
article in a",
- "scientific publication, please cite:",
- "",
-- " Tange, O. (2022, May 22). GNU Parallel 20220522 ('NATO').",
-- " Zenodo. https://doi.org/10.5281/zenodo.6570228";,
+- " Tange, O. (2022, June 22). GNU Parallel 20220622 ('Bongbong').",
+- " Zenodo. https://doi.org/10.5281/zenodo.6682930";,
- "",
- # Before changing these lines, please read
- #
https://www.gnu.org/software/parallel/parallel_design.html#citation-notice
@@ -153,8 +151,8 @@
- "If you use programs that use GNU Parallel to process data for an
article in a",
- "scientific publication, please cite:",
- "",
-- " Tange, O. (2022, May 22). GNU Parallel 20220522 ('NATO').",
-- " Zenodo. https://doi.org/10.5281/zenodo.6570228";,
+- " Tange, O. (2022, June 22). GNU Parallel 20220622 ('Bongbong').",
+- " Zenodo. https://doi.org/10.5281/zenodo.6682930";,
- "",
- # Before changing these line, please read
- #
https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and
@@ -198,7 +196,7 @@
sub status(@) {
my @w = @_;
my $fh = $Global::status_fd || *STDERR;
-@@ -5649,98 +5484,7 @@ sub version() {
+@@ -5663,98 +5498,8 @@ sub version() {
"License GPLv3+: GNU GPL version 3 or later
<https://gnu.org/licenses/gpl.html>",
"This is free software: you are free to change and redistribute it.",
"GNU $Global::progname comes with no warranty.",
@@ -225,20 +223,20 @@
- "If you use programs that use GNU Parallel to process data for an
article in a",
- "scientific publication, please cite:",
- "",
-- "\@software{tange_2022_6570228,",
+- "\@software{tange_2022_6682930,",
- " author = {Tange, Ole},",
-- " title = {GNU Parallel 20220522 ('NATO')},",
-- " month = May,",
+- " title = {GNU Parallel 20220622 ('Bongbong')},",
+- " month = Jun,",
- " year = 2022,",
- " note = {{GNU Parallel is a general parallelizer to run",
- " multiple serial command line programs in
parallel",
- " without changing them.}},",
- " publisher = {Zenodo},",
-- " doi = {10.5281/zenodo.6570228},",
-- " url = {https://doi.org/10.5281/zenodo.6570228}";,
+- " doi = {10.5281/zenodo.6682930},",
+- " url = {https://doi.org/10.5281/zenodo.6682930}";,
- "}",
- "",
-- "(Feel free to use \\nocite{tange_2022_6570228})",
+- "(Feel free to use \\nocite{tange_2022_6682930})",
- "",
- # Before changing these lines, please read
- #
https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and
@@ -256,7 +254,8 @@
- "If you send a copy of your published article to tange\@gnu.org, it
will be",
- "mentioned in the release notes of next version of GNU Parallel.",
- ""
-- );
++ "",
+ );
- while(not grep { -e "$_/will-cite" } @Global::config_dirs) {
- print "\nType: 'will cite' and press enter.\n> ";
- my $input = <STDIN>;
@@ -294,7 +293,6 @@
- }
- }
- }
-+ );
}
sub show_limits() {
Added: 0002-Fix-makefile.patch
===================================================================
--- 0002-Fix-makefile.patch (rev 0)
+++ 0002-Fix-makefile.patch 2022-06-24 03:14:58 UTC (rev 1239315)
@@ -0,0 +1,23 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -281,7 +281,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = src
+-zshcompletiondir = ${datarootdir}/zsh/site-functions
++zshcompletiondir = ${DESTDIR}/${datarootdir}/zsh/site-functions
+ zshcompletion = ${zshcompletiondir}/_parallel
+ 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
+ all: config.h
+@@ -929,9 +929,9 @@ pack_unpack_and_test_build:
+ cd parallel-$(YYYYMMDD) && \
+ ./configure && make -j && sudo make -j install
+ install-data-hook:
+- mkdir -p ${datarootdir}/bash-completion/completions
++ mkdir -p ${DESTDIR}/${datarootdir}/bash-completion/completions
+ mkdir -p ${zshcompletiondir}
+- parallel --shell-completion bash >
${datarootdir}/bash-completion/completions/parallel
++ ./src/parallel --shell-completion bash >
${DESTDIR}/${datarootdir}/bash-completion/completions/parallel
+ echo '#compdef parallel' > ${zshcompletion}
+ echo '(( $$+functions[_comp_parallel] )) ||' >> ${zshcompletion}
+ echo ' eval "$$(parallel --shell-completion auto)" &&' >>
${zshcompletion}
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-06-24 02:50:39 UTC (rev 1239314)
+++ PKGBUILD 2022-06-24 03:14:58 UTC (rev 1239315)
@@ -6,7 +6,7 @@
pkgbase=parallel
pkgname=('parallel' 'parallel-docs')
-pkgver=20220522
+pkgver=20220622
pkgrel=1
pkgdesc='A shell tool for executing jobs in parallel'
arch=('any')
@@ -15,13 +15,16 @@
source=(
"https://ftp.gnu.org/gnu/$pkgbase/$pkgbase-$pkgver.tar.bz2"{,.sig}
'0001-Remove-citation-things.patch'
+ '0002-Fix-makefile.patch'
)
-sha512sums=('45dd1abe8652d29cd054505263b4ed792f42d7d6799ebdbfec07c21d54437d7243a054adff1d6c987eb85260d7ead2a9bb4dacb9d54a8a5b332218e27cf4f62c'
+sha512sums=('d01d86cd2ac373534d147eee8aa666fe26e7207362ea9c036c3744125f72c936d15cf2059429636454f21c8e8c6b3a60c8d761ddfde97ba7388d2cd00495bfa4'
'SKIP'
-
'0222471b1e59a8864d79674e147df0a9452f24f9fdefad336eada8f50da3bd21caefdc98705cdf6ab0b3194962f032f63be118c3ae2eec7b1239023012281eab')
-b2sums=('e32f62930a4147dc950f5bdab1da58bef19c83b75e7257511d44257ef1569b40a34c670c63831f46daabcb390a197b7293aabb66f2dacd9848dd64910fd3b912'
+
'5c98641615a391a0e27a0a4091c8e9faa8689fa1fd7fd6c514ad571ee0e5f63219cc8df4e57c38ebd2d977d5fe13192190849c1c949039cc6433d30f673214cd'
+
'b9fd9645a32376244ce075402783d404842445d3d510d7cffe743e07038d304443bc99a01da74ece20709e8c97c8751b1e097b2e5e8b362a23f851686b2c54df')
+b2sums=('a0fdb1ab330360c28d85ea5608760a961e663a5401b900e6e8eee944250bf233ae1e3f66e6a2b9d54f0c32702127593dab787d29eda636bd457dcc5d4b046785'
'SKIP'
-
'26509c87a6b45aa4659e5cad9b3251e0fcdb44634ddecb29789e25b303d17fb9805967c5fafdcba7720015c2e6c445dfe771bd7538c5800cc6534bddd95dc4a6')
+
'6c6292c983be25992990f0d307c48f351de7a2fdb2a442ab196f2c6fce708b00e2ee784382acb3b14c755c9a9eb5ee3b5bb4faf3be6672e7d756fee740800902'
+
'5a8fd71c7aec3de071acfd0765cca417a6f4db5ca10e04b7786a70e890ecf608c1b4214b4d8d09d7f9c2d7f83c1beb3c569e80a40986d3fa037dc15b2b58bd66')
validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888')
prepare() {
@@ -30,6 +33,9 @@
# remove citation warnings
patch -p1 <"$srcdir"/0001-Remove-citation-things.patch
+ # patch in DESTDIR support to makefile
+ patch -p1 <"$srcdir"/0002-Fix-makefile.patch
+
# remove gnu branding
sed \
--in-place \
