Update packages file for version 34160

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

Makefile.common

@@ -9,6 +9,8 @@ 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)))
@@ -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

packages

@@ -303,6 +303,7 @@ R-covr
 R-cowplot
 R-cpp11
 R-crayon
+R-credentials
 R-crosstalk
 R-crul
 R-csvy
@@ -397,6 +398,7 @@ R-fastmap
 R-fastmatch
 R-fauxpas
 R-fda
+R-fds
 R-feather
 R-ff
 R-fields
@@ -439,6 +441,7 @@ R-geiger
 R-generics
 R-geojson
 R-geometry
+R-gert
 R-getopt
 R-ggjoy
 R-ggplot2
@@ -447,6 +450,7 @@ R-ggridges
 R-ggvis
 R-gh
 R-git2r
+R-gitcreds
 R-glmnet
 R-globals
 R-glue
@@ -706,6 +710,8 @@ R-quantmod
 R-quantreg
 R-questionr
 R-qvcalc
+R-ragg
+R-rainbow
 R-randomForest
 R-randomNames
 R-randtests
@@ -903,6 +909,7 @@ R-vioplot
 R-viridis
 R-viridisLite
 R-visNetwork
+R-waldo
 R-warp
 R-webmockr
 R-webshot
@@ -1008,6 +1015,7 @@ amtk
 analitza
 ansible
 antlr4-python3-runtime
+anyio
 apache-ant
 apipkg
 appdirs
@@ -1045,6 +1053,7 @@ astunparse
 asunder
 asv
 async-timeout
+async_generator
 at
 at-spi2-atk
 at-spi2-core
@@ -1153,6 +1162,7 @@ byobu
 bz2file
 bzip2
 c-ares
+cJSON
 c_rehash
 ca-certs
 ca-certs-static
@@ -1315,6 +1325,7 @@ cups
 cups-bjnp
 cups-filters
 cups-pk-helper
+curio
 curl
 custom_inherit
 cve-bin-tool
@@ -1882,6 +1893,7 @@ jupyter-packaging
 jupyter_client
 jupyter_console
 jupyter_core
+jupyter_server
 jupyterlab
 jupyterlab_launcher
 jupyterlab_pygments
@@ -2576,6 +2588,7 @@ nagios-plugins
 nano
 nasm
 nautilus
+nbclassic
 nbconvert
 nbformat
 nbval
@@ -3577,6 +3590,7 @@ perl-prefork
 perl-strictures
 persistent
 pesign
+petastorm
 pexpect
 phonon
 phonon-vlc