Update packages file for version 36140

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

Makefile.common

@@ -26,6 +26,9 @@ WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
 MOCK_SMP_FLAGS=$(patsubst -j%, -D_smp_mflags\ -j%,$(filter -j%, $(MAKEFLAGS)))
 MOCK ?= $(WITH_SUDO) /usr/bin/mock -r $(MOCK_CONFIG_VAL) $(MOCK_SMP_FLAGS) $(MOCK_OPTS)
 
+MOCK_CLEANUP_OPT := $(if $(CLEANUP),--cleanup-after,--no-cleanup-after)
+AUTOSPEC_CLEANUP_OPT := $(if $(CLEANUP),-C)
+
 ifneq ($(wildcard upstream),)
 __allsources := $(notdir $(strip $(shell cat upstream)))
 __missingsources := $(filter-out $(wildcard ${__allsources}), ${__allsources})
@@ -88,7 +91,7 @@ prebuild-checks:
 #help which creates a src.rpm file from the spec file.
 #help Use MOCK_OPTS environment varible to pass down arbitrary mock options.
 build: prebuild-checks configemail $(SPECFILE) upstream $(SRPMFILE)
-	$(MOCK) $(SRPMFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	$(MOCK) $(SRPMFILE) --result=results/ $(MOCK_CLEANUP_OPT) --uniqueext=$(PKG_NAME)
 	$(MAKE) link-new-rpms PKG_REPO_DIR="."
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
@@ -96,7 +99,7 @@ build: prebuild-checks configemail $(SPECFILE) upstream $(SRPMFILE)
 
 #help build-nocheck: Same as 'make build', but do not run the package's test suite.
 build-nocheck: configemail $(SPECFILE) upstream $(SRPMFILE)
-	$(MOCK) $(SRPMFILE) --nocheck --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	$(MOCK) $(SRPMFILE) --nocheck --result=results/ $(MOCK_CLEANUP_OPT) --uniqueext=$(PKG_NAME)
 	$(MAKE) link-new-rpms PKG_REPO_DIR="."
 	@perl $(TOPLVL)/projects/common/logcheck.pl results/build.log
 	@perl $(TOPLVL)/projects/common/count.pl results/build.log &> testresults
@@ -117,7 +120,7 @@ shell:
 .PHONY: $(SRPMFILE)
 $(SRPMFILE): $(SPECFILE) $(__allsources) localreponotice clean-old-content
 	@$(MAKE) spdxcheck
-	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ --no-cleanup-after --uniqueext=$(PKG_NAME)
+	$(MOCK) --buildsrpm --source=./ --spec=$(SPECFILE) --result=results/ $(MOCK_CLEANUP_OPT) --uniqueext=$(PKG_NAME)
 	mv results/root.log results/srpm-root.log
 	mv results/build.log results/srpm-build.log
 
@@ -179,7 +182,7 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content
 		$${SETVERSION:+ --version $${SETVERSION}} \
 		$${NON_INTERACTIVE:+ --non_interactive} \
 		$${SKIP_GIT:+ --skip-git} \
-		$${CLEANUP:+ -C} \
+		$(AUTOSPEC_CLEANUP_OPT) \
 		$(firstword $(NEWURL) $(URL));
 	$(MAKE) link-new-rpms PKG_REPO_DIR="."
 	@$(MAKE) spdxcheck

Makefile.toplevel

@@ -159,18 +159,18 @@ status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	if [ -d "$$p/.git" ] &&  [ -n "$$(git -C $$p status -uno --porcelain)" ]; then echo "Uncommitted changes in $$p:"; git -C "$$p" status --short; fi ;\
 	done
 
-#help diff: Runs git diff for all package repos and displays the output using
-#help diffstat. Requires that diffstat is installed.
+#help diff: Runs git diff for all package repos and displays the diffstat using
+#help the --stat flag.
 diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff | diffstat -p1); :) ;\
+		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff --stat); :) ;\
 	done
 
 #help log: Run git log origin/master..HEAD for all package repos, thus
 #help displaying any committed but unpushed changes.
 log: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
-		( cd $$p; if [ "$$(git rev-parse --verify HEAD)" != "$$(git rev-parse --verify origin/master)" ] ; then \
+		( cd $$p; if [ -n "$$(git rev-list origin/master..HEAD)" ] ; then \
 		echo $$p ; git --no-pager log --pretty="format:%s" origin/master..HEAD ; echo ; echo;\
 		fi ; ) \
 	done

packages

@@ -49,6 +49,7 @@ QGIS
 R
 R-AER
 R-AMORE
+R-ATR
 R-Amelia
 R-AmesHousing
 R-BB
@@ -408,6 +409,7 @@ R-fixest
 R-flashClust
 R-flexmix
 R-flexsurv
+R-flextable
 R-float
 R-fontBitstreamVera
 R-fontLiberation
@@ -431,6 +433,8 @@ R-future
 R-future.apply
 R-g.data
 R-gam
+R-gamlss.data
+R-gamlss.dist
 R-gamm4
 R-gargle
 R-gbRd
@@ -640,12 +644,14 @@ R-npsurv
 R-numDeriv
 R-nws
 R-nycflights13
+R-officer
 R-openssl
 R-openxlsx
 R-optextras
 R-optimx
 R-optparse
 R-ordinal
+R-ordinalCont
 R-orthopolynom
 R-pROC
 R-packrat
@@ -1503,6 +1509,7 @@ gawk
 gc
 gcab
 gcc
+gcc11
 gcc7
 gcc8
 gcc9
@@ -3542,6 +3549,7 @@ poppler
 poppler-data-clr-rename
 popt
 portaudio
+portmidi
 postfix
 postgis
 postgresql
@@ -3668,6 +3676,7 @@ pypi-cached_property
 pypi-cachetools
 pypi-cachy
 pypi-capturer
+pypi-cattrs
 pypi-cchardet
 pypi-cerberus
 pypi-certifi
@@ -3763,6 +3772,7 @@ pypi-envs
 pypi-eternalegypt
 pypi-etuples
 pypi-evdev
+pypi-exceptiongroup
 pypi-exdir
 pypi-execnet
 pypi-executing
@@ -3784,6 +3794,7 @@ pypi-flask
 pypi-flatten_json
 pypi-flit
 pypi-flit_core
+pypi-flit_scm
 pypi-fontmath
 pypi-freezegun
 pypi-frozenlist
@@ -3973,6 +3984,7 @@ pypi-nbsphinx
 pypi-nbval
 pypi-ncclient
 pypi-ndg_httpsclient
+pypi-neat_python
 pypi-nest_asyncio
 pypi-netapp_lib
 pypi-netdisco
@@ -4083,6 +4095,7 @@ pypi-pydot_ng
 pypi-pyelftools
 pypi-pyfakefs
 pypi-pyflakes
+pypi-pygame
 pypi-pygithub
 pypi-pygments
 pypi-pyicu
@@ -4667,6 +4680,7 @@ thermal_daemon
 thermal_monitor
 thin-provisioning-tools
 threadweaver
+thrift
 thunar-volman
 thunderbird
 thunderbolt-software-user-space