Replace gitdb2/smmap2 with gitdb/smmap

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>

Makefile.common

@@ -304,16 +304,21 @@ prekoji-checks:
 koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
-	@if ! git branch | grep -q -E '^\* master'; then \
+	@if [ "$$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then \
 		echo "Error: Must be on the master branch to submit to koji" >&2; \
 		exit 1; \
 	fi; \
-	if ! git diff --quiet HEAD ${SPECFILE}; then \
+	if ! git diff --quiet HEAD -- ${SPECFILE}; then \
 		echo "Error: All changes to ${SPECFILE} must be committed first" >&2; \
 		exit 1; \
 	fi; \
-	if git rev-parse --verify --quiet origin/master > /dev/null; then \
+	git fetch; \
+	if git rev-parse --verify --quiet origin/master >/dev/null; then \
 		git pull --rebase; \
+	fi; \
+	if git ls-remote --tags --exit-code origin $(SRPMVERS) >/dev/null; then \
+		echo "Error: remote tag $(SRPMVERS) already exists" >&2; \
+		exit 1; \
 	fi
 	git tag $(SRPMVERS)
 	git push origin master refs/tags/$(SRPMVERS)

packages

@@ -31,6 +31,7 @@ HeapDict
 ImageMagick
 JAGS
 Jinja2
+Judy
 Keras
 Keras_Applications
 Keras_Preprocessing
@@ -94,6 +95,7 @@ R-BMS
 R-BatchJobs
 R-BayesFactor
 R-BiasedUrn
+R-BiocManager
 R-BoolNet
 R-BradleyTerry2
 R-Brobdingnag
@@ -288,6 +290,7 @@ R-cmprsk
 R-cobs
 R-coda
 R-coin
+R-collections
 R-colorspace
 R-colourpicker
 R-combinat
@@ -508,6 +511,7 @@ R-labelled
 R-laeken
 R-lambda.r
 R-languageR
+R-languageserver
 R-lars
 R-later
 R-latticeExtra
@@ -636,6 +640,7 @@ R-phylobase
 R-phylogram
 R-phytools
 R-pillar
+R-pixmap
 R-pkgKitten
 R-pkgbuild
 R-pkgconfig
@@ -900,6 +905,7 @@ R-xfun
 R-xml2
 R-xmlparsedata
 R-xopen
+R-xptr
 R-xtable
 R-xts
 R-yaml
@@ -1246,6 +1252,7 @@ chrony
 chrpath
 cifs-utils
 cinder
+clFFT
 clamav
 clear-config-management
 clear-font
@@ -1642,6 +1649,7 @@ font-util
 fontconfig
 fontforge
 fonttools
+fortune-mod
 fossil
 frameworkintegration
 freedv
@@ -1658,6 +1666,7 @@ fuse
 futurist
 fwupd
 fwupdate
+g2fs-utils
 gTTS-token
 gabbi
 garcon
@@ -1703,7 +1712,7 @@ gimp
 girara
 git
 git-gui
-gitdb2
+gitdb
 gitg
 gitolite
 gjs
@@ -1950,6 +1959,7 @@ intervaltree
 intltool
 ioc-cbc-tools
 ioping
+ioport
 iotop
 ipaddr
 ipaddress
@@ -2210,6 +2220,7 @@ kpkpass
 kplotting
 kpty
 kqtquickcharts
+kquickcharts
 krb5
 krdc
 krest
@@ -3609,6 +3620,7 @@ oslo.versionedobjects
 oslo.vmware
 oslosphinx
 oslotest
+osm-gps-map
 osprofiler
 ostree
 otp
@@ -4601,6 +4613,7 @@ postfix
 postgis
 postgresql
 postgresql11
+postgresql12
 potrace
 povray
 powerdevil
@@ -4790,6 +4803,7 @@ qrencode
 qscintilla
 qt-creator
 qt3d
+qt5ct
 qtbase
 qtcanvas3d
 qtcharts
@@ -4845,6 +4859,7 @@ re2
 re2c
 readline
 rebootmgr
+recode
 recommonmark
 redis
 redis-native
@@ -4877,7 +4892,9 @@ retype
 rfc3986
 rfc3987
 rhythmbox
+rinutils
 rjsmin
+rlwrap
 rng-tools
 roboto
 rofi
@@ -4970,7 +4987,7 @@ slurm
 smart_open
 smartcols
 smartmontools
-smmap2
+smmap
 snabb
 snappy
 sndio
@@ -5070,6 +5087,7 @@ swupd-probe
 swupd-search
 sxhkd
 sxiv
+symengine
 sympy
 syndication
 synergy
@@ -5224,6 +5242,7 @@ valgrind
 vbox-integration
 vcstool
 vcversioner
+vifm
 vim
 vim-fugitive
 vim-gnupg