Update packages file for version 34640

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

Makefile.common

@@ -9,13 +9,15 @@ 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) ] || $(call queryspec,%{NVR}\n,$(SPECFILE)))
 SRPMFILE = results/$(SRPMVERS).src.rpm
 
 LATEST_RPMS = $(wildcard rpms/*.rpm)
-DEBUGINFO_RPM = $(wildcard rpms/*-debuginfo-*.rpm)
+DEBUGINFO_RPM = $(wildcard rpms/${PKG_NAME}-debuginfo-$(shell $(call queryspec,%{V}-%{R},${SPECFILE})).*.rpm)
 RPMS ?= $(LATEST_RPMS)
 
 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
@@ -76,7 +78,7 @@ configemail:
 
 #help checkblacklist: Verify rpms files to not include banned files for Clear Linux OS.
 checkblacklist:
-	@$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist results/*.rpm
+	@$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(filter-out ${DEBUGINFO_RPM},${RPMS})
 
 prebuild-checks:
 
@@ -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
@@ -449,6 +451,10 @@ install-debuginfo-local:
 		sudo chown -R dbginfo:dbginfo "$$d"; \
 		sudo cp -a "$$d" $$dest/; \
 	done; \
+	find $$tmpdir/usr/share/debug/.build-id -type l 2> /dev/null | while read -r link; do \
+		new_target=$$(readlink $$link | sed 's|/usr/share/debug|/usr/lib/debug|'); \
+		sudo ln -sf "$$new_target" "$$link"; \
+	done; \
 	find $$tmpdir/usr/share/debug/ -mindepth 1 -maxdepth 1 -regextype awk -regex '.*/(.build-id|boot|lib|sbin|usr)$$' 2> /dev/null | while read -r d; do \
 		sudo chown -R dbginfo:dbginfo "$$d"; \
 		sudo cp -a "$$d" $$dest/; \

Makefile.toplevel

@@ -163,7 +163,7 @@ status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 #help diffstat. Requires that diffstat is installed.
 diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in: $$p"; git diff |diffstat -p1)) ;\
+		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff | diffstat -p1); :) ;\
 	done
 
 #help log: Run git log origin/master..HEAD for all package repos, thus

licenses-spdx

@@ -45,11 +45,14 @@ BSD-3-Clause
 BSD-3-Clause-Attribution
 BSD-3-Clause-Clear
 BSD-3-Clause-LBNL
+BSD-3-Clause-Modification
+BSD-3-Clause-No-Military-License
 BSD-3-Clause-No-Nuclear-License
 BSD-3-Clause-No-Nuclear-License-2014
 BSD-3-Clause-No-Nuclear-Warranty
 BSD-3-Clause-Open-MPI
 BSD-4-Clause
+BSD-4-Clause-Shortened
 BSD-4-Clause-UC
 BSD-Protection
 BSD-Source-Code
@@ -62,6 +65,7 @@ BitTorrent-1.0
 BitTorrent-1.1
 BlueOak-1.0.0
 Borceux
+C-UDA-1.0
 CAL-1.0
 CAL-1.0-Combined-Work-Exception
 CATOSL-1.1
@@ -96,6 +100,7 @@ CC-BY-ND-4.0
 CC-BY-SA-1.0
 CC-BY-SA-2.0
 CC-BY-SA-2.0-UK
+CC-BY-SA-2.1-JP
 CC-BY-SA-2.5
 CC-BY-SA-3.0
 CC-BY-SA-3.0-AT
@@ -104,6 +109,7 @@ CC-PDDC
 CC0-1.0
 CDDL-1.0
 CDDL-1.1
+CDL-1.0
 CDLA-Permissive-1.0
 CDLA-Sharing-1.0
 CECILL-1.0
@@ -132,6 +138,7 @@ CrystalStacker
 Cube
 D-FSL-1.0
 DOC
+DRL-1.0
 DSDP
 Dotseqn
 ECL-1.0
@@ -154,7 +161,9 @@ FSFULLR
 FTL
 Fair
 Frameworx-1.0
+FreeBSD-DOC
 FreeImage
+GD
 GFDL-1.1
 GFDL-1.1-invariants-only
 GFDL-1.1-invariants-or-later
@@ -252,6 +261,7 @@ Linux-OpenIB
 MIT
 MIT-0
 MIT-CMU
+MIT-Modern-Variant
 MIT-advertising
 MIT-enna
 MIT-feh
@@ -271,6 +281,7 @@ MulanPSL-1.0
 MulanPSL-2.0
 Multics
 Mup
+NAIST-2003
 NASA-1.3
 NBPL-1.0
 NCGL-UK-2.0
@@ -306,6 +317,7 @@ OFL-1.1
 OFL-1.1-RFN
 OFL-1.1-no-RFN
 OGC-1.0
+OGDL-Taiwan-1.0
 OGL-Canada-2.0
 OGL-UK-1.0
 OGL-UK-2.0

packages

@@ -72,6 +72,7 @@ PyWavelets
 PyYAML
 Pygments
 Pyro4
+QAT_engine
 QGIS
 QtAwesome
 QtPy
@@ -92,6 +93,7 @@ R-BiocManager
 R-BoolNet
 R-BradleyTerry2
 R-Brobdingnag
+R-C50
 R-CVST
 R-Cairo
 R-CircStats
@@ -107,6 +109,7 @@ R-DT
 R-DendSer
 R-Deriv
 R-DescTools
+R-DiagrammeR
 R-DistributionUtils
 R-DoseFinding
 R-Ecdat
@@ -260,9 +263,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 +298,7 @@ R-commonmark
 R-compositions
 R-conditionz
 R-config
+R-conflicted
 R-conquer
 R-contfrac
 R-conting
@@ -303,6 +309,7 @@ R-covr
 R-cowplot
 R-cpp11
 R-crayon
+R-credentials
 R-crosstalk
 R-crul
 R-csvy
@@ -339,6 +346,7 @@ R-doParallel
 R-doRNG
 R-doSNOW
 R-dotCall64
+R-downlit
 R-downloader
 R-dplyr
 R-drc
@@ -352,6 +360,7 @@ R-eRm
 R-earth
 R-eco
 R-ecodist
+R-eddington
 R-effects
 R-eha
 R-eiPack
@@ -391,12 +400,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
@@ -428,6 +439,7 @@ R-future
 R-g.data
 R-gam
 R-gamm4
+R-gargle
 R-gbRd
 R-gbm
 R-gbutils
@@ -439,6 +451,7 @@ R-geiger
 R-generics
 R-geojson
 R-geometry
+R-gert
 R-getopt
 R-ggjoy
 R-ggplot2
@@ -447,6 +460,8 @@ R-ggridges
 R-ggvis
 R-gh
 R-git2r
+R-gitcreds
+R-gld
 R-glmnet
 R-globals
 R-glue
@@ -455,10 +470,13 @@ R-gmp
 R-gnm
 R-goftest
 R-googleVis
+R-googledrive
+R-googlesheets4
 R-gower
 R-gplots
 R-gridBase
 R-gridExtra
+R-gsl
 R-gss
 R-gtable
 R-gtools
@@ -481,6 +499,7 @@ R-hunspell
 R-hwriter
 R-hypergeo
 R-ica
+R-ids
 R-igraph
 R-import
 R-ineq
@@ -499,6 +518,7 @@ R-joineR
 R-joineRML
 R-jpeg
 R-jqr
+R-jquerylib
 R-jsonlite
 R-kableExtra
 R-keras
@@ -511,6 +531,7 @@ R-ks
 R-labeling
 R-labelled
 R-laeken
+R-lamW
 R-lambda.r
 R-languageR
 R-languageserver
@@ -535,6 +556,7 @@ R-listviewer
 R-lle
 R-lme4
 R-lmerTest
+R-lmom
 R-lmtest
 R-locfit
 R-logcondens
@@ -566,6 +588,7 @@ R-mda
 R-measures
 R-memisc
 R-memoise
+R-metafor
 R-mi
 R-mice
 R-microbenchmark
@@ -622,6 +645,7 @@ R-optparse
 R-ordinal
 R-pROC
 R-packrat
+R-palmerpenguins
 R-pamr
 R-pander
 R-parallelly
@@ -655,6 +679,7 @@ R-pkgload
 R-pkgmaker
 R-plm
 R-plogr
+R-plot3D
 R-plotly
 R-plotmo
 R-plotrix
@@ -706,6 +731,8 @@ R-quantmod
 R-quantreg
 R-questionr
 R-qvcalc
+R-ragg
+R-rainbow
 R-randomForest
 R-randomNames
 R-randtests
@@ -717,7 +744,9 @@ R-rasterVis
 R-rbenchmark
 R-rbibutils
 R-rcmdcheck
+R-rcorpora
 R-reactR
+R-reactable
 R-reactlog
 R-readODS
 R-readr
@@ -733,6 +762,7 @@ R-remotes
 R-rentrez
 R-repr
 R-reprex
+R-repurrrsive
 R-reshape
 R-reshape2
 R-reticulate
@@ -765,6 +795,7 @@ R-robustbase
 R-rootSolve
 R-rotl
 R-roxygen2
+R-rpart.plot
 R-rprojroot
 R-rrcov
 R-rredlist
@@ -774,6 +805,7 @@ R-rsdmx
 R-rstan
 R-rstanarm
 R-rstantools
+R-rstpm2
 R-rstudio
 R-rstudio-server
 R-rstudioapi
@@ -784,6 +816,7 @@ R-rvest
 R-sROC
 R-sampling
 R-sandwich
+R-sass
 R-scales
 R-scatterplot3d
 R-sde
@@ -825,7 +858,11 @@ R-spData
 R-spam
 R-sparkline
 R-spatstat
+R-spatstat.core
 R-spatstat.data
+R-spatstat.geom
+R-spatstat.linnet
+R-spatstat.sparse
 R-spatstat.utils
 R-spc
 R-spdep
@@ -848,6 +885,7 @@ R-subselect
 R-superpc
 R-survey
 R-svUnit
+R-svglite
 R-sys
 R-systemfit
 R-systemfonts
@@ -858,6 +896,7 @@ R-tclust
 R-tensor
 R-tensorA
 R-tensorflow
+R-terra
 R-testit
 R-testthat
 R-texreg
@@ -866,6 +905,7 @@ R-tfruns
 R-threejs
 R-tibble
 R-tidyr
+R-tidyrules
 R-tidyselect
 R-tidyverse
 R-tikzDevice
@@ -899,11 +939,14 @@ R-vcdExtra
 R-vcr
 R-vctrs
 R-vegan
+R-vembedr
 R-vioplot
 R-viridis
 R-viridisLite
 R-visNetwork
+R-waldo
 R-warp
+R-webfakes
 R-webmockr
 R-webshot
 R-webutils
@@ -976,6 +1019,7 @@ XStatic-term.js
 Z3
 abireport
 absl-py
+abydos
 accountsservice
 acl
 acme
@@ -1008,6 +1052,7 @@ amtk
 analitza
 ansible
 antlr4-python3-runtime
+anyio
 apache-ant
 apipkg
 appdirs
@@ -1045,6 +1090,7 @@ astunparse
 asunder
 asv
 async-timeout
+async_generator
 at
 at-spi2-atk
 at-spi2-core
@@ -1070,6 +1116,7 @@ automake
 autossh
 avahi
 awesome-wm
+awesomeversion
 awscli
 axel
 azure-configs
@@ -1077,6 +1124,7 @@ azure-iot-sdk
 babeltrace
 babl
 backcall
+backports.entry_points_selectable
 backports.ssl_match_hostname
 backports.weakref
 baloo
@@ -1105,6 +1153,8 @@ bleach
 blender
 blinken
 blinker
+blivet
+blivet-gui
 blktrace
 blockdiag
 bluedevil
@@ -1123,6 +1173,7 @@ boto
 boto3
 botocore
 bovo
+box2d
 bpftrace
 breeze
 breeze-gtk
@@ -1153,6 +1204,7 @@ byobu
 bz2file
 bzip2
 c-ares
+cJSON
 c_rehash
 ca-certs
 ca-certs-static
@@ -1257,25 +1309,27 @@ colord-gtk
 colordiff
 columbiad
 commonmark
-compat-boost-soname1.72.0
+compat-atkmm-soname16
 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-icu4c-soname64
+compat-libffi-soname6
 compat-libhandy-0.0
 compat-libpng-soname12
-compat-libraw-soname19
+compat-libsigc++-soname20
 compat-libva-soname1
-compat-nettle-soname6
+compat-lua-52
+compat-lua-53
 compat-nettle-soname7
-compat-opencv-soname42
-compat-protobuf-soname22
-compat-python38
+compat-pangomm-soname14
 compat-re2-soname7
 compat-readline-soname5
 compat-tracker-soname2.0
+complete
 component
 compute-image-packages
 conda
@@ -1315,6 +1369,7 @@ cups
 cups-bjnp
 cups-filters
 cups-pk-helper
+curio
 curl
 custom_inherit
 cve-bin-tool
@@ -1354,9 +1409,11 @@ diffoscope
 diffstat
 diffutils
 digikam
+dill
 ding-libs
 dino
 direwolf
+diskcache
 dist-pam-configs
 distlib
 distributed
@@ -1385,6 +1442,7 @@ docbook-utils
 docbook-xml
 docbook2X
 docker
+docker-cli
 docker-compose
 docker-py
 docker-pycreds
@@ -1520,6 +1578,7 @@ fribidi
 fritzing-app
 fs
 fsearch
+fsspec
 funcparserlib
 funcsigs
 fuse
@@ -1549,6 +1608,7 @@ geany
 geany-plugins
 geary
 gedit
+gedit-plugins-gnome
 geeqie
 gegl
 gensim
@@ -1703,6 +1763,7 @@ gtk-doc
 gtk-vnc
 gtk-xfce-engine
 gtk3
+gtk4
 gtkmm2
 gtkmm3
 gtksourceview
@@ -1795,9 +1856,7 @@ init-rdahead
 inkscape
 innoextract
 inotify-tools
-intel-compute-runtime
 intel-gmmlib
-intel-graphics-compiler
 intel-hybrid-driver
 intel-ipsec-mb
 intel-media-driver
@@ -1816,6 +1875,7 @@ ipe
 iperf
 ipmctl
 ipmitool
+ipp-crypto
 iproute2
 ipset
 iptables
@@ -1856,6 +1916,7 @@ javaproperties
 jdcal
 jedi
 jeepney
+jellyfish
 jemalloc
 jmespath
 joblib
@@ -1863,6 +1924,7 @@ joe
 josepy
 jpegoptim
 jq
+js8call
 jsmin
 json-c
 json-glib
@@ -1882,6 +1944,7 @@ jupyter-packaging
 jupyter_client
 jupyter_console
 jupyter_core
+jupyter_server
 jupyterlab
 jupyterlab_launcher
 jupyterlab_pygments
@@ -2091,6 +2154,7 @@ ktp-desktop-applets
 ktuberling
 kturtle
 kubernetes
+kubernetes-migration-1.18
 kunitconversion
 kwallet
 kwallet-pam
@@ -2141,9 +2205,9 @@ libXtst
 libXv
 libXvMC
 libXxf86dga
-libXxf86misc
 libabigail
 libabw
+libadwaita
 libaio
 libappindicator
 libarchive
@@ -2185,6 +2249,7 @@ libdmx
 libdnf
 libdrm
 libe-book
+libebur128
 libeconf
 libedit
 libepoxy
@@ -2285,6 +2350,7 @@ libnice
 libnl
 libnma
 libnotify
+libnsl
 libnumbertext
 liboauth
 libodfgen
@@ -2307,6 +2373,7 @@ libpwquality
 libqalculate
 libqb
 libqmi
+libqrtr-glib
 libqtxdg
 libqxp
 libratbag
@@ -2340,6 +2407,7 @@ libssh
 libssh2
 libstaroffice
 libstatgrab
+libstemmer_c
 libstoragemgmt
 libsysstat
 libtasn1
@@ -2349,11 +2417,14 @@ libtheora
 libtirpc
 libtool
 libtorrent-rasterbar
+libtraceevent
+libtracefs
 libudev0-shim
 libuninameslist
 libunistring
 libunwind
 libusb
+libusb-compat
 libuser
 libuv
 libva
@@ -2417,6 +2488,7 @@ lksctp-tools
 lldb
 llfuse
 llvm
+llvm10
 llvm8
 llvm9
 lm-sensors
@@ -2438,7 +2510,6 @@ lttng-tools
 lttng-ust
 lua
 lua-nginx-module
-lua52
 lualgi
 luarocks
 lutris
@@ -2476,6 +2547,7 @@ man-pages-posix
 marble
 mariadb
 matplotlib
+matplotlib-inline
 mc
 mccabe
 mcelog
@@ -2520,6 +2592,7 @@ mkl-dnn
 mkosi
 mlocate
 mlt
+mm-common
 mmc-utils
 mobile-broadband-provider-info
 mock
@@ -2538,7 +2611,6 @@ mosh
 mosquitto
 motd-update
 motif
-mozjs68
 mozjs78
 mpc
 mpfr
@@ -2576,6 +2648,8 @@ nagios-plugins
 nano
 nasm
 nautilus
+nbclassic
+nbclient
 nbconvert
 nbformat
 nbval
@@ -2588,6 +2662,7 @@ ndpi
 neofetch
 neomutt
 neovim
+nest_asyncio
 net-snmp
 net-tools
 netaddr
@@ -2755,6 +2830,7 @@ pdns
 pdns-recursor
 pdsh
 pecan
+ped
 pep517
 pep8
 perftest
@@ -2910,7 +2986,6 @@ perl-DBIx-ContextualFetch
 perl-DBIx-DBSchema
 perl-DBIx-Simple
 perl-DB_File
-perl-Data-Alias
 perl-Data-Compare
 perl-Data-Denter
 perl-Data-Dump
@@ -3158,6 +3233,7 @@ perl-List-MoreUtils
 perl-List-MoreUtils-XS
 perl-List-SomeUtils
 perl-List-SomeUtils-XS
+perl-List-Util
 perl-List-UtilsBy
 perl-Locale-Maketext-Gettext
 perl-Locale-Maketext-Lexicon
@@ -3317,6 +3393,7 @@ perl-Pod-Constants
 perl-Pod-Coverage
 perl-Pod-LaTeX
 perl-Pod-POM
+perl-Pod-Parser
 perl-Pod-Plainer
 perl-Pod-Spell
 perl-Pod-Strip
@@ -3341,6 +3418,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
@@ -3577,6 +3655,7 @@ perl-prefork
 perl-strictures
 persistent
 pesign
+petastorm
 pexpect
 phonon
 phonon-vlc
@@ -3649,6 +3728,7 @@ php-zmq
 pickleshare
 picmi
 picocom
+pid
 pidgin
 pidgin-sipe
 pigeonhole
@@ -3672,6 +3752,7 @@ plasma-framework
 plasma-integration
 plasma-nm
 plasma-pa
+plasma-systemmonitor
 plasma-vault
 plasma-wayland-protocols
 plasma-workspace
@@ -3714,6 +3795,7 @@ prison
 processor-trace
 procmail
 procps-ng
+progress
 progressbar
 proj
 prometheus_client
@@ -3765,6 +3847,7 @@ pynvim
 pyotherside
 pyotp
 pyparsing
+pyparted
 pyperclip
 pyperf
 pyquery
@@ -3793,6 +3876,7 @@ python-Levenshtein
 python-augeas
 python-crfsuite
 python-dateutil
+python-dbusmock
 python-digitalocean
 python-distutils-extra
 python-dotenv
@@ -3803,6 +3887,8 @@ python-hwinfo
 python-jsonrpc-server
 python-kconfiglib
 python-language-server
+python-lsp-jsonrpc
+python-lsp-server
 python-magic
 python-memcached
 python-mimeparse
@@ -3829,6 +3915,7 @@ pyu2f
 pyudev
 pyusb
 pywbem
+pyxDamerauLevenshtein
 pyxattr
 pyxdg
 pyzmq
@@ -3935,11 +4022,13 @@ rinutils
 rjsmin
 rlwrap
 rng-tools
+robin-map
 roboto
 rocs
 rofi
 rope
 rpcbind
+rpcsvc-proto
 rpm
 rr
 rrdtool
@@ -4176,6 +4265,7 @@ tldextract
 tmux
 tokyocabinet
 toml
+tomlkit
 toolz
 tornado
 totem