Update packages file for version 34310

Signed-off-by: clrbuilder <clrbuilder@intel.com>

Makefile.common

@@ -9,9 +9,11 @@ include $(TOPLVL)/projects/common/Makefile.shared
 
 SHELL  = /bin/bash
 
+CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))
 
-SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || rpmspec -D '_vendor clr' --srpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' $(SPECFILE))
+SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || $(call queryspec,%{NVR}\n,$(SPECFILE)))
 SRPMFILE = results/$(SRPMVERS).src.rpm
 
 LATEST_RPMS = $(wildcard rpms/*.rpm)
@@ -46,7 +48,7 @@ upstream:
 #help spdxcheck: Checks that the package license is a valid SPDX license,
 #help or that it is in the exceptions list.
 spdxcheck: $(SPECFILE)
-	@for LICENSE in `rpmspec -D '_vendor clr' --srpm -q --queryformat '%{LICENSE}\n' $(SPECFILE)`; do \
+	@for LICENSE in `$(call queryspec,%{LICENSE}\n,$(SPECFILE))`; do \
 		if ! grep -qx "$$LICENSE" $(TOPLVL)/projects/common/licenses-{spdx,exceptions,extra}; then FAIL=yes; echo "ERROR: License '$$LICENSE' is not an allowed SPDX license ID"; fi; \
 	done; test -z "$$FAIL"
 
@@ -217,12 +219,12 @@ bump:
 	git pull --rebase
 	$(MAKE) bumpnogit
 	git add $(SPECFILE) release
-	git commit -a -m "version bump from $(shell rpmspec -D '_vendor clr' --srpm -q --queryformat '%{VERSION}-%{RELEASE}\n' $(SPECFILE)) to `rpmspec -D '_vendor clr' --srpm -q --queryformat '%{VERSION}-%{RELEASE}\n' $(SPECFILE)`"
+	git commit -a -m "version bump from $(shell $(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))) to `$(call queryspec,%{VERSION}-%{RELEASE}\n,$(SPECFILE))`"
 
 #help bumpnogit: Increments the release file by one and does not commit changes.
 bumpnogit:
 	@$(MAKE) spdxcheck
-	oldrel=$(shell rpmspec -D '_vendor clr' --srpm -q --queryformat '%{RELEASE}\n' $(SPECFILE)); \
+	oldrel=$(shell $(call queryspec,%{RELEASE}\n,$(SPECFILE))); \
 	newrel=$$(($$oldrel + 1)); \
 	sed -i "s/^\(Release[[:blank:]]*:[[:blank:]]*\)$$oldrel$$/\1$$newrel/" $(SPECFILE); \
 	echo "$$newrel" > release;
@@ -232,7 +234,7 @@ $(__missingsources): sources
 # First argument is a Clear Linux build number (e.g. 22000)
 define fetch-from-srpm
 	tmp=$$(mktemp -d -p "."); \
-	srpm=$$(rpmspec --srpm -q --qf "%{NVR}.src.rpm\n" $(SPECFILE)); \
+	srpm=$$($(call queryspec,%{NVR}.src.rpm\n,$(SPECFILE))); \
 	if cd "$$tmp" && ! curl -s -S -f -L -O $(MIRROR_CURL_OPTS) $(DOWNLOAD_MIRROR)/releases/$(1)/clear/source/SRPMS/$$srpm; then \
 		echo "Failed to download $$srpm from Clear Linux release $(1)." >&2; \
 		cd .. && rm -rf "$$tmp"; \
@@ -240,7 +242,7 @@ define fetch-from-srpm
 	fi; \
 	rpm2cpio $$srpm | cpio --quiet -id; \
 	cd ..; \
-	srclist=$$(rpmspec --srpm -q --qf "[%{SOURCE}\n]" $(SPECFILE)); \
+	srclist=$$($(call queryspec,[%{SOURCE}\n],$(SPECFILE))); \
 	for s in $$srclist; do \
 		if ! mv --no-clobber "$$tmp"/$$s .; then \
 			echo "Missing source file \"$$s\" in $${srpm}." >&2; \
@@ -279,7 +281,7 @@ else
 sources:
 	@$(MAKE) generateupstream; \
 	[ $$? -eq 0 ] && exit 0; \
-	nvr="$$(rpmspec --srpm -q --qf '%{NAME}\t%{VERSION}\t%{RELEASE}\n' $(SPECFILE))"; \
+	nvr="$$($(call queryspec,%{NAME}\t%{VERSION}\t%{RELEASE}\n,$(SPECFILE)))"; \
 	git -C $(TOPLVL)/projects/common fetch --tags >/dev/null 2>&1; \
 	latest_builds=$$(git -C $(TOPLVL)/projects/common tag -l | sort -rn); \
 	for b in $$latest_builds; do \
@@ -305,8 +307,8 @@ prekoji-checks:
 koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
-	@if [ "$$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then \
-		echo "Error: Must be on the master branch to submit to koji" >&2; \
+	@if [ "$(CURRENT_BRANCH)" != "master" ] && [ "$(CURRENT_BRANCH)" != "main" ]; then \
+		echo "Error: Must be on the \"master\" or \"main\" branch to submit to koji" >&2; \
 		exit 1; \
 	fi; \
 	if ! git diff --quiet HEAD -- ${SPECFILE}; then \
@@ -322,7 +324,7 @@ koji: prekoji-checks kojidef
 		exit 1; \
 	fi
 	git tag $(SRPMVERS)
-	git push origin master refs/tags/$(SRPMVERS)
+	git push origin $(CURRENT_BRANCH):master refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
 
 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the

Makefile.shared

@@ -47,6 +47,14 @@ define subjectprefix
 	git config format.subjectPrefix "PATCH $(1)"
 endef
 
+# Query the spec file (or spec files) listed in argument 2 for the field(s)
+# specified in argument 1. The fields are derived from the source rpm(s)
+# generated by the specs. Queried fields that are declared within the spec file
+# must be declared above the first %files section.
+define queryspec
+rpmspec --define='_vendor clr' --srpm --query --queryformat='$(1)' <(sed -n '1,/%files/p' $(2))
+endef
+
 # If GITOLITE_BASE_URL is defined, sets a repo's push URL for that gitolite
 # instance. Accepts one argument: the path to the repo on gitolite. If
 # GITOLITE_BASE_URL is not defined, no push URL is set -- the shell's null

Makefile.toplevel

@@ -178,13 +178,13 @@ log: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 #help versions: Displays the version of each package in the ./packages tree.
 versions: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}\n' *.spec | head -n1; fi) ;\
+		(cd $$p; if ls *.spec &> /dev/null; then $(call queryspec,%{NAME}-%{VERSION}\n,*.spec) | head -n1; fi) ;\
 	done
 
 #help releases: Like 'make versions', but also displays the release number.
 releases: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p; if ls *.spec &> /dev/null; then rpmspec -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}\n' *.spec | head -n1; fi) ;\
+		(cd $$p; if ls *.spec &> /dev/null; then $(call queryspec,%{NVR}\n,*.spec) | head -n1; fi) ;\
 	done
 
 #help provides:     Is used to find out which RPM package provides some file.

packages

@@ -260,9 +260,11 @@ R-bridgesampling
 R-brio
 R-brms
 R-broom
+R-bslib
 R-bvls
 R-ca
 R-caTools
+R-cachem
 R-calibrate
 R-calibrator
 R-callr
@@ -293,6 +295,7 @@ R-commonmark
 R-compositions
 R-conditionz
 R-config
+R-conflicted
 R-conquer
 R-contfrac
 R-conting
@@ -303,6 +306,7 @@ R-covr
 R-cowplot
 R-cpp11
 R-crayon
+R-credentials
 R-crosstalk
 R-crul
 R-csvy
@@ -339,6 +343,7 @@ R-doParallel
 R-doRNG
 R-doSNOW
 R-dotCall64
+R-downlit
 R-downloader
 R-dplyr
 R-drc
@@ -352,6 +357,7 @@ R-eRm
 R-earth
 R-eco
 R-ecodist
+R-eddington
 R-effects
 R-eha
 R-eiPack
@@ -391,12 +397,14 @@ R-fUnitRoots
 R-fail
 R-fansi
 R-farver
+R-fastGHQuad
 R-fastICA
 R-fastcluster
 R-fastmap
 R-fastmatch
 R-fauxpas
 R-fda
+R-fds
 R-feather
 R-ff
 R-fields
@@ -415,6 +423,7 @@ R-forcats
 R-foreach
 R-forecast
 R-formatR
+R-formattable
 R-fossil
 R-fpc
 R-fracdiff
@@ -438,6 +447,7 @@ R-geiger
 R-generics
 R-geojson
 R-geometry
+R-gert
 R-getopt
 R-ggjoy
 R-ggplot2
@@ -446,6 +456,8 @@ R-ggridges
 R-ggvis
 R-gh
 R-git2r
+R-gitcreds
+R-gld
 R-glmnet
 R-globals
 R-glue
@@ -458,6 +470,7 @@ R-gower
 R-gplots
 R-gridBase
 R-gridExtra
+R-gsl
 R-gss
 R-gtable
 R-gtools
@@ -498,7 +511,9 @@ R-joineR
 R-joineRML
 R-jpeg
 R-jqr
+R-jquerylib
 R-jsonlite
+R-kableExtra
 R-keras
 R-kernlab
 R-kimisc
@@ -533,6 +548,7 @@ R-listviewer
 R-lle
 R-lme4
 R-lmerTest
+R-lmom
 R-lmtest
 R-locfit
 R-logcondens
@@ -554,6 +570,7 @@ R-mapproj
 R-maps
 R-maptools
 R-markdown
+R-mathjaxr
 R-matrixStats
 R-matrixcalc
 R-maxLik
@@ -563,6 +580,7 @@ R-mda
 R-measures
 R-memisc
 R-memoise
+R-metafor
 R-mi
 R-mice
 R-microbenchmark
@@ -620,6 +638,7 @@ R-ordinal
 R-pROC
 R-packrat
 R-pamr
+R-pander
 R-parallelly
 R-parsedate
 R-partitions
@@ -671,6 +690,7 @@ R-prefmod
 R-prettyunits
 R-princurve
 R-processx
+R-procmaps
 R-prodlim
 R-profdpm
 R-profileModel
@@ -701,6 +721,8 @@ R-quantmod
 R-quantreg
 R-questionr
 R-qvcalc
+R-ragg
+R-rainbow
 R-randomForest
 R-randomNames
 R-randtests
@@ -713,6 +735,7 @@ R-rbenchmark
 R-rbibutils
 R-rcmdcheck
 R-reactR
+R-reactable
 R-reactlog
 R-readODS
 R-readr
@@ -769,6 +792,7 @@ R-rsdmx
 R-rstan
 R-rstanarm
 R-rstantools
+R-rstpm2
 R-rstudio
 R-rstudio-server
 R-rstudioapi
@@ -779,6 +803,7 @@ R-rvest
 R-sROC
 R-sampling
 R-sandwich
+R-sass
 R-scales
 R-scatterplot3d
 R-sde
@@ -818,8 +843,11 @@ R-sourcetools
 R-sp
 R-spData
 R-spam
+R-sparkline
 R-spatstat
 R-spatstat.data
+R-spatstat.geom
+R-spatstat.sparse
 R-spatstat.utils
 R-spc
 R-spdep
@@ -845,6 +873,7 @@ R-svUnit
 R-sys
 R-systemfit
 R-systemfonts
+R-tables
 R-tau
 R-taxize
 R-tclust
@@ -892,10 +921,12 @@ R-vcdExtra
 R-vcr
 R-vctrs
 R-vegan
+R-vembedr
 R-vioplot
 R-viridis
 R-viridisLite
 R-visNetwork
+R-waldo
 R-warp
 R-webmockr
 R-webshot
@@ -903,6 +934,7 @@ R-webutils
 R-whisker
 R-whoami
 R-wikitaxa
+R-winch
 R-withr
 R-worrms
 R-xfun
@@ -968,6 +1000,7 @@ XStatic-term.js
 Z3
 abireport
 absl-py
+abydos
 accountsservice
 acl
 acme
@@ -1000,6 +1033,7 @@ amtk
 analitza
 ansible
 antlr4-python3-runtime
+anyio
 apache-ant
 apipkg
 appdirs
@@ -1037,6 +1071,7 @@ astunparse
 asunder
 asv
 async-timeout
+async_generator
 at
 at-spi2-atk
 at-spi2-core
@@ -1062,96 +1097,11 @@ automake
 autossh
 avahi
 awesome-wm
+awesomeversion
 awscli
 axel
-azure-batch
-azure-cli
-azure-cli-command-modules-nspkg
-azure-cli-core
-azure-cli-nspkg
-azure-cli-telemetry
-azure-common
 azure-configs
-azure-core
-azure-cosmos
-azure-datalake-store
-azure-functions-devops-build
-azure-graphrbac
 azure-iot-sdk
-azure-keyvault
-azure-keyvault-certificates
-azure-keyvault-keys
-azure-keyvault-secrets
-azure-loganalytics
-azure-mgmt-advisor
-azure-mgmt-apimanagement
-azure-mgmt-appconfiguration
-azure-mgmt-applicationinsights
-azure-mgmt-authorization
-azure-mgmt-batch
-azure-mgmt-batchai
-azure-mgmt-billing
-azure-mgmt-botservice
-azure-mgmt-cdn
-azure-mgmt-cognitiveservices
-azure-mgmt-compute
-azure-mgmt-consumption
-azure-mgmt-containerinstance
-azure-mgmt-containerregistry
-azure-mgmt-containerservice
-azure-mgmt-core
-azure-mgmt-cosmosdb
-azure-mgmt-datalake-analytics
-azure-mgmt-datalake-nspkg
-azure-mgmt-datalake-store
-azure-mgmt-datamigration
-azure-mgmt-deploymentmanager
-azure-mgmt-devtestlabs
-azure-mgmt-dns
-azure-mgmt-eventgrid
-azure-mgmt-eventhub
-azure-mgmt-hdinsight
-azure-mgmt-imagebuilder
-azure-mgmt-iotcentral
-azure-mgmt-iothub
-azure-mgmt-iothubprovisioningservices
-azure-mgmt-keyvault
-azure-mgmt-kusto
-azure-mgmt-loganalytics
-azure-mgmt-managedservices
-azure-mgmt-managementgroups
-azure-mgmt-maps
-azure-mgmt-marketplaceordering
-azure-mgmt-media
-azure-mgmt-monitor
-azure-mgmt-msi
-azure-mgmt-netapp
-azure-mgmt-network
-azure-mgmt-nspkg
-azure-mgmt-policyinsights
-azure-mgmt-privatedns
-azure-mgmt-rdbms
-azure-mgmt-recoveryservices
-azure-mgmt-recoveryservicesbackup
-azure-mgmt-redhatopenshift
-azure-mgmt-redis
-azure-mgmt-relay
-azure-mgmt-reservations
-azure-mgmt-resource
-azure-mgmt-search
-azure-mgmt-security
-azure-mgmt-servicebus
-azure-mgmt-servicefabric
-azure-mgmt-signalr
-azure-mgmt-sql
-azure-mgmt-sqlvirtualmachine
-azure-mgmt-storage
-azure-mgmt-trafficmanager
-azure-mgmt-web
-azure-multiapi-storage
-azure-nspkg
-azure-storage-blob
-azure-storage-common
 babeltrace
 babl
 backcall
@@ -1183,6 +1133,8 @@ bleach
 blender
 blinken
 blinker
+blivet
+blivet-gui
 blktrace
 blockdiag
 bluedevil
@@ -1201,6 +1153,7 @@ boto
 boto3
 botocore
 bovo
+box2d
 bpftrace
 breeze
 breeze-gtk
@@ -1231,6 +1184,7 @@ byobu
 bz2file
 bzip2
 c-ares
+cJSON
 c_rehash
 ca-certs
 ca-certs-static
@@ -1335,21 +1289,25 @@ colord-gtk
 colordiff
 columbiad
 commonmark
+compat-atkmm-soname16
 compat-boost-soname1.72.0
 compat-boost-soname1.73.0
+compat-cairomm-soname10
 compat-curl-gnutls-soname4
 compat-enchant-soname1
 compat-fuse-soname2
+compat-glibmm-soname24
 compat-gtksourceview-soname3
-compat-hunspell-soname1.6
 compat-icu4c-soname64
 compat-libhandy-0.0
 compat-libpng-soname12
 compat-libraw-soname19
+compat-libsigc++-soname20
 compat-libva-soname1
 compat-nettle-soname6
 compat-nettle-soname7
 compat-opencv-soname42
+compat-pangomm-soname14
 compat-protobuf-soname22
 compat-re2-soname7
 compat-readline-soname5
@@ -1393,6 +1351,7 @@ cups
 cups-bjnp
 cups-filters
 cups-pk-helper
+curio
 curl
 custom_inherit
 cve-bin-tool
@@ -1420,6 +1379,7 @@ decorator
 defusedxml
 dejagnu
 dejavu-fonts
+deprecation
 desktop-file-utils
 devhelp
 dfc
@@ -1431,6 +1391,7 @@ diffoscope
 diffstat
 diffutils
 digikam
+dill
 ding-libs
 dino
 direwolf
@@ -1619,12 +1580,14 @@ gdal
 gdb
 gdbm
 gdk-pixbuf
+gdk-pixbuf-xlib
 gdl
 gdm
 geany
 geany-plugins
 geary
 gedit
+gedit-plugins-gnome
 geeqie
 gegl
 gensim
@@ -1865,6 +1828,7 @@ importlib_metadata
 indent
 influxdb
 iniconfig
+inih
 iniparse
 init-rdahead
 inkscape
@@ -1921,6 +1885,7 @@ iwd
 ixion
 jack2
 jansson
+janus
 jaraco.classes
 jaraco.collections
 jaraco.functools
@@ -1930,6 +1895,7 @@ javaproperties
 jdcal
 jedi
 jeepney
+jellyfish
 jemalloc
 jmespath
 joblib
@@ -1952,13 +1918,16 @@ juk
 jupyter
 jupyter-nbgallery
 jupyter-notebook-gist
+jupyter-packaging
 jupyter_client
 jupyter_console
 jupyter_core
+jupyter_server
 jupyterlab
 jupyterlab_launcher
 jupyterlab_pygments
 jupyterlab_server
+jupyterlab_widgets
 kactivities
 kactivities-stats
 kactivitymanagerd
@@ -2163,6 +2132,7 @@ ktp-desktop-applets
 ktuberling
 kturtle
 kubernetes
+kubernetes-migration-1.18
 kunitconversion
 kwallet
 kwallet-pam
@@ -2213,7 +2183,6 @@ libXtst
 libXv
 libXvMC
 libXxf86dga
-libXxf86misc
 libabigail
 libabw
 libaio
@@ -2257,6 +2226,7 @@ libdmx
 libdnf
 libdrm
 libe-book
+libebur128
 libeconf
 libedit
 libepoxy
@@ -2592,6 +2562,7 @@ mkl-dnn
 mkosi
 mlocate
 mlt
+mm-common
 mmc-utils
 mobile-broadband-provider-info
 mock
@@ -2618,14 +2589,11 @@ mpg123
 mpi4py
 mpmath
 mpv
-msal
-msal-extensions
 msgpack
 msgpack-c
 msmtp
 msr-tools
 msrest
-msrestazure
 mstflint
 mtd-utils
 mtdev
@@ -2651,6 +2619,8 @@ nagios-plugins
 nano
 nasm
 nautilus
+nbclassic
+nbclient
 nbconvert
 nbformat
 nbval
@@ -2663,6 +2633,7 @@ ndpi
 neofetch
 neomutt
 neovim
+nest_asyncio
 net-snmp
 net-tools
 netaddr
@@ -2792,6 +2763,7 @@ p11-kit
 p7zip
 packaging
 pacrunner
+paho-mqtt
 paho.mqtt.c
 paho.mqtt.cpp
 palapeli
@@ -2829,6 +2801,7 @@ pdns
 pdns-recursor
 pdsh
 pecan
+ped
 pep517
 pep8
 perftest
@@ -3415,6 +3388,7 @@ perl-SGMLS
 perl-SMTP-Server
 perl-SQL-Abstract
 perl-SQL-Abstract-Classic
+perl-SQL-Abstract-Pg
 perl-SQL-SplitStatement
 perl-SQL-Tokenizer
 perl-SQL-Translator
@@ -3651,6 +3625,7 @@ perl-prefork
 perl-strictures
 persistent
 pesign
+petastorm
 pexpect
 phonon
 phonon-vlc
@@ -3723,6 +3698,7 @@ php-zmq
 pickleshare
 picmi
 picocom
+pid
 pidgin
 pidgin-sipe
 pigeonhole
@@ -3839,6 +3815,7 @@ pynvim
 pyotherside
 pyotp
 pyparsing
+pyparted
 pyperclip
 pyperf
 pyquery
@@ -3903,6 +3880,7 @@ pyu2f
 pyudev
 pyusb
 pywbem
+pyxDamerauLevenshtein
 pyxattr
 pyxdg
 pyzmq
@@ -3993,6 +3971,7 @@ requests-mock
 requests-ntlm
 requests-oauthlib
 requests-toolbelt
+requests-unixsocket
 responses
 rest
 restic
@@ -4222,6 +4201,7 @@ texinfo
 texlive
 texmaker
 text-unidecode
+textdistance
 texttable
 tflearn
 tgt
@@ -4272,6 +4252,7 @@ typing_extensions
 tzdata
 tzlocal
 ua-parser
+uamqp
 ucpp
 udisks2
 udunits