Update for SPDX 3.18 release

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>

Makefile.common

@@ -217,14 +217,24 @@ autospecnostate:
 scanlicense:
 	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --config $(AUTOSPEC_CONF) --license-only $(firstword $(NEWURL) $(URL)) --name $(PKG_NAME)
 
-#help bump: Increments the release file by one.
+#help bump: Increments the package release number by one and commits the result. If
+#help the variable BUMP_MSG is set, its value is used as the commit summary.
+#help Otherwise a generic commit summary is used.
 bump:
 	git pull --rebase
 	$(MAKE) bumpnogit
 	git add $(SPECFILE) release
-	git commit -a -m "version bump from $(shell $(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))) to `$(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))`"
+	fromver=$(shell $(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))); \
+	tover=`$(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))`; \
+	if [[ -n "$(BUMP_MSG)" ]]; then \
+		bumpmsg="$(BUMP_MSG)"; \
+	else \
+		bumpmsg="version bump from $$fromver to $$tover"; \
+	fi; \
+	git commit -a -m "$$bumpmsg"
 
-#help bumpnogit: Increments the release file by one and does not commit changes.
+#help bumpnogit: Increments the package release number by one and does not commit
+#help changes.
 bumpnogit:
 	@$(MAKE) spdxcheck
 	oldrel=$(shell $(call queryspec,%{RELEASE}\n,$(SPECFILE))); \
@@ -331,8 +341,9 @@ koji: prekoji-checks kojidef
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
 	@if [ -f bump.list ]; then \
 		$(MAKE) koji-waitrepo; \
+		msg="Bump for $(shell $(call queryspec,%{NAME} %{VERSION}\n,$(SPECFILE)))"; \
 		for bump_dep in $$(cat bump.list); do \
-			(cd ../"$$bump_dep" && $(MAKE) bump && $(MAKE) koji-nowait) \
+			(cd ../"$$bump_dep" && $(MAKE) bump BUMP_MSG="$$msg" && $(MAKE) koji-nowait) \
 		done \
 	fi
 
@@ -375,6 +386,27 @@ koji-waitrepo: kojidef
 		koji wait-repo --build=${SRPMVERS} ${WAIT_OPTS} ${KOJI_TAG}-build; \
 	fi
 
+update-versions:
+
+.PHONY: update
+#help update: Tries to run update.sh if it exists. update.sh is expected
+#help to check for version updates, exit (successfully) if none are found
+#help or update the package and push the update to koji.
+#help If no update.sh exists, update the version, autospec and push the
+#help update to koji (bumping the bump.list if found).
+update:
+	@if [ -f update.sh ]; then \
+		./update.sh; \
+	else \
+		$(MAKE) -s update-versions && \
+		$(MAKE) autospec CLEANUP=1 && \
+		if [ -f bump.list ]; then \
+			$(MAKE) -s koji; \
+		else \
+			$(MAKE) -s koji-nowait; \
+		fi \
+	fi \
+
 logcheck:
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 

licenses-spdx

@@ -32,6 +32,7 @@ Apache-1.0
 Apache-1.1
 Apache-2.0
 App-s2p
+Arphic-1999
 Artistic-1.0
 Artistic-1.0-Perl
 Artistic-1.0-cl8
@@ -59,11 +60,13 @@ BSD-Protection
 BSD-Source-Code
 BSL-1.0
 BUSL-1.1
+Baekmuk
 Bahyph
 Barr
 Beerware
 BitTorrent-1.0
 BitTorrent-1.1
+Bitstream-Vera
 BlueOak-1.0.0
 Borceux
 C-UDA-1.0
@@ -77,6 +80,7 @@ CC-BY-2.5-AU
 CC-BY-3.0
 CC-BY-3.0-AT
 CC-BY-3.0-DE
+CC-BY-3.0-IGO
 CC-BY-3.0-NL
 CC-BY-3.0-US
 CC-BY-4.0
@@ -270,6 +274,8 @@ LPPL-1.1
 LPPL-1.2
 LPPL-1.3a
 LPPL-1.3c
+LZMA-SDK-9.11-to-9.20
+LZMA-SDK-9.22
 Latex2e
 Leptonica
 LiLiQ-P-1.1
@@ -291,10 +297,12 @@ MPL-1.0
 MPL-1.1
 MPL-2.0
 MPL-2.0-no-copyleft-exception
+MS-LPL
 MS-PL
 MS-RL
 MTLL
 MakeIndex
+Minpack
 MirOS
 Motosoto
 MulanPSL-1.0
@@ -307,6 +315,7 @@ NBPL-1.0
 NCGL-UK-2.0
 NCSA
 NGPL
+NICTA-1.0
 NIST-PD
 NIST-PD-fallback
 NLOD-1.0
@@ -381,6 +390,7 @@ PolyForm-Noncommercial-1.0.0
 PolyForm-Small-Business-1.0.0
 PostgreSQL
 Python-2.0
+Python-2.0.1
 QPL-1.0
 Qhull
 RHeCos-1.1
@@ -475,7 +485,9 @@ iMatix
 libpng-2.0
 libselinux-1.0
 libtiff
+mpi-permissive
 mpich2
+mplus
 psfrag
 psutils
 wxWindows

packages

@@ -56,7 +56,6 @@ R-BB
 R-BBmisc
 R-BH
 R-BMA
-R-BMS
 R-BatchJobs
 R-BayesFactor
 R-BiasedUrn
@@ -166,6 +165,7 @@ R-Rserve
 R-Rsolnp
 R-Rtsne
 R-Rvmmin
+R-Ryacas
 R-SDMTools
 R-SGP
 R-SGPdata
@@ -287,7 +287,6 @@ R-config
 R-conflicted
 R-conquer
 R-contfrac
-R-conting
 R-corpcor
 R-corrgram
 R-corrplot
@@ -371,18 +370,15 @@ R-evd
 R-expint
 R-expm
 R-expsmooth
-R-fAsianOptions
 R-fAssets
 R-fBasics
 R-fBonds
 R-fCopulae
-R-fExoticOptions
 R-fExtremes
 R-fGarch
 R-fImport
 R-fMultivar
 R-fNonlinear
-R-fOptions
 R-fRegression
 R-fTrading
 R-fUnitRoots
@@ -645,7 +641,6 @@ R-nnls
 R-nortest
 R-npsurv
 R-numDeriv
-R-nws
 R-nycflights13
 R-officer
 R-openssl
@@ -720,9 +715,9 @@ R-princurve
 R-processx
 R-procmaps
 R-prodlim
-R-profdpm
 R-profileModel
 R-profmem
+R-profvis
 R-progress
 R-progressr
 R-projpred
@@ -837,7 +832,6 @@ R-runjags
 R-rversions
 R-rvest
 R-s2
-R-sROC
 R-sampling
 R-sandwich
 R-sass
@@ -955,10 +949,10 @@ R-tseries
 R-tsne
 R-tzdb
 R-ucminf
-R-unbalanced
 R-units
 R-unix
 R-urca
+R-urlchecker
 R-urltools
 R-uroot
 R-usethis
@@ -1115,7 +1109,6 @@ automake
 autossh
 avahi
 awesome-wm
-aws-sam-translator
 awscli
 axel
 azure-configs
@@ -1166,6 +1159,7 @@ bridge-utils
 brotli
 bsdiff
 bspwm
+btop
 btrfs-progs
 bubblewrap
 buildreq-R
@@ -1294,17 +1288,13 @@ compat-libpng-soname12
 compat-libsigc++-soname20
 compat-libsoup-soname-24
 compat-libva-soname1
-compat-libvpx-soname6
 compat-lua-52
 compat-lua-53
 compat-nettle-soname7
 compat-pangomm-soname14
-compat-poppler-soname112
 compat-poppler-soname117
-compat-protobuf-soname23
 compat-readline-soname5
 compat-rest-soname07
-compat-tbb-soname12
 compat-tracker-soname2.0
 compat-webkitgtk-soname40
 component
@@ -1408,6 +1398,7 @@ dropwatch
 dssi
 dstat
 dtc
+duktape
 dunst
 duperemove
 dvisvgm
@@ -1700,7 +1691,6 @@ hexchat
 hexedit
 hicolor-icon-theme
 hiredis-c
-home-assistant
 hostname
 hplip
 htop
@@ -1773,7 +1763,6 @@ isa-l
 iso-codes
 isodate
 isomd5sum
-ister
 isync
 itstool
 iw
@@ -2314,18 +2303,16 @@ linux-aws
 linux-current
 linux-firmware
 linux-firmware-ipu
-linux-gce
-linux-hyperv
 linux-hyperv-lts
 linux-iot-lts2018
 linux-iot-lts2018-preempt-rt
 linux-kata
-linux-kvm
 linux-libc-headers
 linux-lts2017
 linux-lts2018
 linux-lts2019
 linux-lts2020
+linux-lts2021
 linux-mainline
 linux-oracle
 linux-preempt-rt
@@ -2410,6 +2397,8 @@ messagelib
 meta-c-basic
 meta-desktop-gnome
 meta-desktop-kde
+meta-os-core
+meta-os-core-plus
 metacity
 metis
 metrics-discovery
@@ -2450,7 +2439,6 @@ mosh
 mosquitto
 motd-update
 motif
-mozjs78
 mozjs91
 mpc
 mpfr
@@ -2973,6 +2961,7 @@ perl-IO-All
 perl-IO-Async
 perl-IO-Capture
 perl-IO-CaptureOutput
+perl-IO-FDPass
 perl-IO-HTML
 perl-IO-Interactive
 perl-IO-Interactive-Tiny
@@ -3043,6 +3032,8 @@ perl-Log-Message
 perl-Log-Message-Simple
 perl-Log-Trace
 perl-MARC-Record
+perl-MCE
+perl-MCE-Shared
 perl-MIME-Base32
 perl-MIME-Base64
 perl-MIME-Base64-URLSafe
@@ -3567,7 +3558,7 @@ postgresql
 postgresql11
 postgresql12
 postgresql13
-postgresql14
+postgresql9
 potrace
 powerdevil
 powerline-fonts
@@ -3646,12 +3637,12 @@ pypi-asynctest
 pypi-atomicwrites
 pypi-atpublic
 pypi-attrs
+pypi-automat
 pypi-awesomeversion
 pypi-awscrt
 pypi-awxkit
 pypi-azure_common
 pypi-azure_core
-pypi-azure_devops
 pypi-azure_mgmt_compute
 pypi-azure_mgmt_core
 pypi-azure_mgmt_netapp
@@ -3767,14 +3758,12 @@ pypi-diffoscope
 pypi-dill
 pypi-diskcache
 pypi-distlib
-pypi-distributed
 pypi-dj_database_url
 pypi-django
 pypi-django_appconf
 pypi-django_compressor
 pypi-django_discover_runner
 pypi-django_nose
-pypi-django_pyscss
 pypi-dnacentersdk
 pypi-dns_lexicon
 pypi-dnspython
@@ -3869,7 +3858,6 @@ pypi-httpcore
 pypi-httplib2
 pypi-httpretty
 pypi-httpx
-pypi-hug
 pypi-humanfriendly
 pypi-humanize
 pypi-hyperframe
@@ -3987,8 +3975,6 @@ pypi-mergedeep
 pypi-mido
 pypi-minikanren
 pypi-mistune
-pypi-mkdocs
-pypi-mkdocs_material
 pypi-mkdocs_material_extensions
 pypi-mock
 pypi-modulegraph
@@ -4059,13 +4045,11 @@ pypi-partd
 pypi-paste
 pypi-pastedeploy
 pypi-pastel
-pypi-pathlib
 pypi-pathspec
 pypi-pathtools
 pypi-patsy
 pypi-pbr
 pypi-pdm_pep517
-pypi-pdocs
 pypi-pecan
 pypi-ped
 pypi-pep517
@@ -4093,7 +4077,6 @@ pypi-polib
 pypi-port_for
 pypi-portalocker
 pypi-portend
-pypi-portray
 pypi-posix_ipc
 pypi-poyo
 pypi-pre_commit
@@ -4112,7 +4095,6 @@ pypi-purestorage
 pypi-purity_fb
 pypi-py
 pypi-py_cpuinfo
-pypi-py_pure_client
 pypi-pyaml
 pypi-pyasn1
 pypi-pyasn1_modules
@@ -4130,6 +4112,7 @@ pypi-pycryptodome
 pypi-pycryptodomex
 pypi-pycups
 pypi-pycurl
+pypi-pydantic
 pypi-pydata_sphinx_theme
 pypi-pydispatcher
 pypi-pydocstyle
@@ -4150,11 +4133,13 @@ pypi-pymdown_extensions
 pypi-pynacl
 pypi-pynetbox
 pypi-pynsist
+pypi-pyomo
 pypi-pyopengl
 pypi-pyopenssl
 pypi-pyparsing
 pypi-pyperclip
 pypi-pyperf
+pypi-pyproject_metadata
 pypi-pyprojectx
 pypi-pypsrp
 pypi-pyqrcode
@@ -4206,6 +4191,7 @@ pypi-python_lsp_server
 pypi-python_multilib
 pypi-python_slugify
 pypi-python_string_utils
+pypi-python_version
 pypi-python_xlib
 pypi-pythran
 pypi-pytoolconfig
@@ -4215,6 +4201,7 @@ pypi-pyu2f
 pypi-pyusb
 pypi-pywavelets
 pypi-pywbem
+pypi-pywinrm
 pypi-pyxattr
 pypi-pyxdameraulevenshtein
 pypi-pyxdg
@@ -4285,7 +4272,6 @@ pypi-sh
 pypi-shapely
 pypi-shellingham
 pypi-simplegeneric
-pypi-singledispatch
 pypi-six
 pypi-smart_open
 pypi-smartypants
@@ -4298,7 +4284,6 @@ pypi-sphinx
 pypi-sphinx_ansible_theme
 pypi-sphinx_argparse
 pypi-sphinx_autobuild
-pypi-sphinx_book_theme
 pypi-sphinx_copybutton
 pypi-sphinx_design
 pypi-sphinx_feature_classification
@@ -4307,7 +4292,6 @@ pypi-sphinx_issues
 pypi-sphinx_last_updated_by_git
 pypi-sphinx_notfound_page
 pypi-sphinx_rtd_theme
-pypi-sphinx_thebe
 pypi-sphinx_theme_builder
 pypi-sphinx_togglebutton
 pypi-sphinxcontrib_apidoc
@@ -4346,6 +4330,7 @@ pypi-tblib
 pypi-templated_dictionary
 pypi-tempora
 pypi-tenacity
+pypi-termcolor
 pypi-terminado
 pypi-terminaltables
 pypi-testpath
@@ -4403,7 +4388,6 @@ pypi-uc_micro_py
 pypi-ufolib2
 pypi-uharfbuzz
 pypi-ujson
-pypi-uncertainpy
 pypi-unicodedata2
 pypi-unidecode
 pypi-unidiff
@@ -4418,7 +4402,6 @@ pypi-virtualenv
 pypi-volatile
 pypi-voluptuous
 pypi-voluptuous_serialize
-pypi-vsts
 pypi-vsts_cd_manager
 pypi-waitress
 pypi-watchdog
@@ -4492,6 +4475,7 @@ python-zstandard
 python3
 pyudev
 qalculate-gtk
+qatlib
 qbittorrent
 qca-qt5
 qemu
@@ -4570,7 +4554,6 @@ renderdoc
 requests-ntlm
 rest
 restic
-retrying
 rhythmbox
 rinutils
 rlwrap
@@ -4720,7 +4703,6 @@ telemetrics-client
 telepathy-glib
 telepathy-qt
 tepl
-termcolor
 terminology
 terminus-font
 tesseract