Update packages file for version 34360

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

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

packages

@@ -107,6 +107,7 @@ R-DT
 R-DendSer
 R-Deriv
 R-DescTools
+R-DiagrammeR
 R-DistributionUtils
 R-DoseFinding
 R-Ecdat
@@ -260,9 +261,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 +296,7 @@ R-commonmark
 R-compositions
 R-conditionz
 R-config
+R-conflicted
 R-conquer
 R-contfrac
 R-conting
@@ -303,6 +307,7 @@ R-covr
 R-cowplot
 R-cpp11
 R-crayon
+R-credentials
 R-crosstalk
 R-crul
 R-csvy
@@ -339,6 +344,7 @@ R-doParallel
 R-doRNG
 R-doSNOW
 R-dotCall64
+R-downlit
 R-downloader
 R-dplyr
 R-drc
@@ -352,6 +358,7 @@ R-eRm
 R-earth
 R-eco
 R-ecodist
+R-eddington
 R-effects
 R-eha
 R-eiPack
@@ -391,12 +398,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
@@ -439,6 +448,7 @@ R-geiger
 R-generics
 R-geojson
 R-geometry
+R-gert
 R-getopt
 R-ggjoy
 R-ggplot2
@@ -447,6 +457,8 @@ R-ggridges
 R-ggvis
 R-gh
 R-git2r
+R-gitcreds
+R-gld
 R-glmnet
 R-globals
 R-glue
@@ -459,6 +471,7 @@ R-gower
 R-gplots
 R-gridBase
 R-gridExtra
+R-gsl
 R-gss
 R-gtable
 R-gtools
@@ -499,6 +512,7 @@ R-joineR
 R-joineRML
 R-jpeg
 R-jqr
+R-jquerylib
 R-jsonlite
 R-kableExtra
 R-keras
@@ -535,6 +549,7 @@ R-listviewer
 R-lle
 R-lme4
 R-lmerTest
+R-lmom
 R-lmtest
 R-locfit
 R-logcondens
@@ -566,6 +581,7 @@ R-mda
 R-measures
 R-memisc
 R-memoise
+R-metafor
 R-mi
 R-mice
 R-microbenchmark
@@ -655,6 +671,7 @@ R-pkgload
 R-pkgmaker
 R-plm
 R-plogr
+R-plot3D
 R-plotly
 R-plotmo
 R-plotrix
@@ -706,6 +723,8 @@ R-quantmod
 R-quantreg
 R-questionr
 R-qvcalc
+R-ragg
+R-rainbow
 R-randomForest
 R-randomNames
 R-randtests
@@ -718,6 +737,7 @@ R-rbenchmark
 R-rbibutils
 R-rcmdcheck
 R-reactR
+R-reactable
 R-reactlog
 R-readODS
 R-readr
@@ -774,6 +794,7 @@ R-rsdmx
 R-rstan
 R-rstanarm
 R-rstantools
+R-rstpm2
 R-rstudio
 R-rstudio-server
 R-rstudioapi
@@ -784,6 +805,7 @@ R-rvest
 R-sROC
 R-sampling
 R-sandwich
+R-sass
 R-scales
 R-scatterplot3d
 R-sde
@@ -826,6 +848,8 @@ R-spam
 R-sparkline
 R-spatstat
 R-spatstat.data
+R-spatstat.geom
+R-spatstat.sparse
 R-spatstat.utils
 R-spc
 R-spdep
@@ -848,6 +872,7 @@ R-subselect
 R-superpc
 R-survey
 R-svUnit
+R-svglite
 R-sys
 R-systemfit
 R-systemfonts
@@ -899,10 +924,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
@@ -976,6 +1003,7 @@ XStatic-term.js
 Z3
 abireport
 absl-py
+abydos
 accountsservice
 acl
 acme
@@ -1008,6 +1036,7 @@ amtk
 analitza
 ansible
 antlr4-python3-runtime
+anyio
 apache-ant
 apipkg
 appdirs
@@ -1045,6 +1074,7 @@ astunparse
 asunder
 asv
 async-timeout
+async_generator
 at
 at-spi2-atk
 at-spi2-core
@@ -1070,6 +1100,7 @@ automake
 autossh
 avahi
 awesome-wm
+awesomeversion
 awscli
 axel
 azure-configs
@@ -1105,6 +1136,8 @@ bleach
 blender
 blinken
 blinker
+blivet
+blivet-gui
 blktrace
 blockdiag
 bluedevil
@@ -1123,6 +1156,7 @@ boto
 boto3
 botocore
 bovo
+box2d
 bpftrace
 breeze
 breeze-gtk
@@ -1153,6 +1187,7 @@ byobu
 bz2file
 bzip2
 c-ares
+cJSON
 c_rehash
 ca-certs
 ca-certs-static
@@ -1257,22 +1292,20 @@ 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-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-protobuf-soname22
-compat-python38
+compat-pangomm-soname14
 compat-re2-soname7
 compat-readline-soname5
 compat-tracker-soname2.0
@@ -1315,6 +1348,7 @@ cups
 cups-bjnp
 cups-filters
 cups-pk-helper
+curio
 curl
 custom_inherit
 cve-bin-tool
@@ -1354,6 +1388,7 @@ diffoscope
 diffstat
 diffutils
 digikam
+dill
 ding-libs
 dino
 direwolf
@@ -1549,6 +1584,7 @@ geany
 geany-plugins
 geary
 gedit
+gedit-plugins-gnome
 geeqie
 gegl
 gensim
@@ -1856,6 +1892,7 @@ javaproperties
 jdcal
 jedi
 jeepney
+jellyfish
 jemalloc
 jmespath
 joblib
@@ -1882,6 +1919,7 @@ jupyter-packaging
 jupyter_client
 jupyter_console
 jupyter_core
+jupyter_server
 jupyterlab
 jupyterlab_launcher
 jupyterlab_pygments
@@ -2091,6 +2129,7 @@ ktp-desktop-applets
 ktuberling
 kturtle
 kubernetes
+kubernetes-migration-1.18
 kunitconversion
 kwallet
 kwallet-pam
@@ -2141,7 +2180,6 @@ libXtst
 libXv
 libXvMC
 libXxf86dga
-libXxf86misc
 libabigail
 libabw
 libaio
@@ -2185,6 +2223,7 @@ libdmx
 libdnf
 libdrm
 libe-book
+libebur128
 libeconf
 libedit
 libepoxy
@@ -2520,6 +2559,7 @@ mkl-dnn
 mkosi
 mlocate
 mlt
+mm-common
 mmc-utils
 mobile-broadband-provider-info
 mock
@@ -2576,6 +2616,8 @@ nagios-plugins
 nano
 nasm
 nautilus
+nbclassic
+nbclient
 nbconvert
 nbformat
 nbval
@@ -2588,6 +2630,7 @@ ndpi
 neofetch
 neomutt
 neovim
+nest_asyncio
 net-snmp
 net-tools
 netaddr
@@ -2755,6 +2798,7 @@ pdns
 pdns-recursor
 pdsh
 pecan
+ped
 pep517
 pep8
 perftest
@@ -3341,6 +3385,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 +3622,7 @@ perl-prefork
 perl-strictures
 persistent
 pesign
+petastorm
 pexpect
 phonon
 phonon-vlc
@@ -3649,6 +3695,7 @@ php-zmq
 pickleshare
 picmi
 picocom
+pid
 pidgin
 pidgin-sipe
 pigeonhole
@@ -3765,6 +3812,7 @@ pynvim
 pyotherside
 pyotp
 pyparsing
+pyparted
 pyperclip
 pyperf
 pyquery
@@ -3829,6 +3877,7 @@ pyu2f
 pyudev
 pyusb
 pywbem
+pyxDamerauLevenshtein
 pyxattr
 pyxdg
 pyzmq
@@ -3935,6 +3984,7 @@ rinutils
 rjsmin
 rlwrap
 rng-tools
+robin-map
 roboto
 rocs
 rofi