Date: Monday, July 25, 2022 @ 08:39:31 Author: grawlinson Revision: 1257129
upgpkg: parallel 20220722-1; new upstream release Modified: parallel/trunk/0001-Remove-citation-things.patch parallel/trunk/PKGBUILD Deleted: parallel/trunk/0002-Fix-makefile.patch -----------------------------------+ 0001-Remove-citation-things.patch | 34 ++++++++++++++++------------------ 0002-Fix-makefile.patch | 23 ----------------------- PKGBUILD | 16 +++++----------- 3 files changed, 21 insertions(+), 52 deletions(-) Modified: 0001-Remove-citation-things.patch =================================================================== --- 0001-Remove-citation-things.patch 2022-07-25 08:39:27 UTC (rev 1257128) +++ 0001-Remove-citation-things.patch 2022-07-25 08:39:31 UTC (rev 1257129) @@ -1,6 +1,6 @@ --- a/src/parallel +++ b/src/parallel -@@ -1920,11 +1920,6 @@ sub options_completion_hash() { +@@ -1927,11 +1927,6 @@ sub options_completion_hash() { "gnu[Behave like GNU parallel]" => \$opt::gnu, "link|xapply[Link input sources]" => \$opt::link, "linkinputsource|xapplyinputsource=i" => \@opt::linkinputsource, @@ -12,7 +12,7 @@ ("bibtex|citation". "[Print the citation notice and BibTeX entry for GNU parallel, ". "silence citation notice for all future runs, and exit. ". -@@ -2159,15 +2154,6 @@ sub parse_options(@) { +@@ -2166,15 +2161,6 @@ sub parse_options(@) { my @argv_before = @ARGV; @ARGV = read_options(); @@ -28,7 +28,7 @@ # no-* overrides * if($opt::nokeeporder) { $opt::keeporder = undef; } -@@ -2459,81 +2445,6 @@ sub parse_options(@) { +@@ -2463,81 +2449,6 @@ sub parse_options(@) { if(defined $opt::eta) { $opt::progress = $opt::eta; } if(defined $opt::bar) { $opt::progress = $opt::bar; } @@ -110,7 +110,7 @@ parse_halt(); if($ENV{'PARALLEL_ENV'}) { -@@ -5521,85 +5432,9 @@ sub usage() { +@@ -5531,85 +5442,9 @@ sub usage() { "", "GNU Parallel can do much more. See 'man $Global::progname' for details", "", @@ -118,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, June 22). GNU Parallel 20220622 ('Bongbong').", -- " Zenodo. https://doi.org/10.5281/zenodo.6682930", +- " Tange, O. (2022, July 22). GNU Parallel 20220722 ('Roe vs Wade').", +- " Zenodo. https://doi.org/10.5281/zenodo.6891516", - "", - # Before changing these lines, please read - # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice @@ -151,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, June 22). GNU Parallel 20220622 ('Bongbong').", -- " Zenodo. https://doi.org/10.5281/zenodo.6682930", +- " Tange, O. (2022, July 22). GNU Parallel 20220722 ('Roe vs Wade').", +- " Zenodo. https://doi.org/10.5281/zenodo.6891516", - "", - # Before changing these line, please read - # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and @@ -196,11 +196,10 @@ sub status(@) { my @w = @_; my $fh = $Global::status_fd || *STDERR; -@@ -5663,98 +5498,8 @@ sub version() { - "License GPLv3+: GNU GPL version 3 or later <https://gnu.org/licenses/gpl.html>", +@@ -5674,97 +5509,7 @@ sub version() { "This is free software: you are free to change and redistribute it.", "GNU $Global::progname comes with no warranty.", -- "", + "", - "Web site: https://www.gnu.org/software/${Global::progname}\n", - "When using programs that use GNU Parallel to process data for publication", - "please cite as described in 'parallel --citation'.\n", @@ -223,20 +222,20 @@ - "If you use programs that use GNU Parallel to process data for an article in a", - "scientific publication, please cite:", - "", -- "\@software{tange_2022_6682930,", +- "\@software{tange_2022_6891516,", - " author = {Tange, Ole},", -- " title = {GNU Parallel 20220622 ('Bongbong')},", -- " month = Jun,", +- " title = {GNU Parallel 20220722 ('Roe vs Wade')},", +- " month = Jul,", - " 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.6682930},", -- " url = {https://doi.org/10.5281/zenodo.6682930}", +- " doi = {10.5281/zenodo.6891516},", +- " url = {https://doi.org/10.5281/zenodo.6891516}", - "}", - "", -- "(Feel free to use \\nocite{tange_2022_6682930})", +- "(Feel free to use \\nocite{tange_2022_6891516})", - "", - # Before changing these lines, please read - # https://www.gnu.org/software/parallel/parallel_design.html#citation-notice and @@ -254,7 +253,6 @@ - "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> "; Deleted: 0002-Fix-makefile.patch =================================================================== --- 0002-Fix-makefile.patch 2022-07-25 08:39:27 UTC (rev 1257128) +++ 0002-Fix-makefile.patch 2022-07-25 08:39:31 UTC (rev 1257129) @@ -1,23 +0,0 @@ ---- 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-07-25 08:39:27 UTC (rev 1257128) +++ PKGBUILD 2022-07-25 08:39:31 UTC (rev 1257129) @@ -6,7 +6,7 @@ pkgbase=parallel pkgname=('parallel' 'parallel-docs') -pkgver=20220622 +pkgver=20220722 pkgrel=1 pkgdesc='A shell tool for executing jobs in parallel' arch=('any') @@ -15,16 +15,13 @@ source=( "https://ftp.gnu.org/gnu/$pkgbase/$pkgbase-$pkgver.tar.bz2"{,.sig} '0001-Remove-citation-things.patch' - '0002-Fix-makefile.patch' ) -sha512sums=('d01d86cd2ac373534d147eee8aa666fe26e7207362ea9c036c3744125f72c936d15cf2059429636454f21c8e8c6b3a60c8d761ddfde97ba7388d2cd00495bfa4' +sha512sums=('b3bee9861ad9537055f00ebc7a1593697cb9f53167bd79fb612b9567a1d19edb7b770e5e68cee410bf2a146f3c48608e7a47254972f28ca0418d725b8d2088d3' 'SKIP' - '5c98641615a391a0e27a0a4091c8e9faa8689fa1fd7fd6c514ad571ee0e5f63219cc8df4e57c38ebd2d977d5fe13192190849c1c949039cc6433d30f673214cd' - 'b9fd9645a32376244ce075402783d404842445d3d510d7cffe743e07038d304443bc99a01da74ece20709e8c97c8751b1e097b2e5e8b362a23f851686b2c54df') -b2sums=('a0fdb1ab330360c28d85ea5608760a961e663a5401b900e6e8eee944250bf233ae1e3f66e6a2b9d54f0c32702127593dab787d29eda636bd457dcc5d4b046785' + '4624afb1e3a00bb61d3a3d307be81e04ab994a272d6ede00b1742e2d423226ed747419cf89c7e10f5714a47d6c91ad1a698eb46ca68248f10b4b214f575da8f3') +b2sums=('76d9edddac82b5077d6416cf629dc02d427c93a42907f84a467a45805efe99154eaa175755a4a4c9a9d86df480842daef7064b1d324671eeb6c08fdbab3e7b70' 'SKIP' - '6c6292c983be25992990f0d307c48f351de7a2fdb2a442ab196f2c6fce708b00e2ee784382acb3b14c755c9a9eb5ee3b5bb4faf3be6672e7d756fee740800902' - '5a8fd71c7aec3de071acfd0765cca417a6f4db5ca10e04b7786a70e890ecf608c1b4214b4d8d09d7f9c2d7f83c1beb3c569e80a40986d3fa037dc15b2b58bd66') + '864c0e55b1853fd0b2bca53f2976d3306e560b77c07c729dc45aa839951469caa11642eaba88998bbf24e9c35f9587f0f795701a0cf0719e202a0cf2e2476055') validpgpkeys=('CDA01A4208C4F74506107E7BD1AB451688888888') prepare() { @@ -33,9 +30,6 @@ # 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 \