Replace gitdb2/smmap2 with gitdb/smmap

Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>
Update packages file for version 32390
2026-06-17 11:36:24 +00:00 · 2020-02-24 16:20:26 -08:00 · 2020-02-24 18:20:28 +00:00 · 2020-02-21 06:09:31 +00:00 · 2020-02-20 10:17:32 -08:00 · 2020-02-20 06:09:16 +00:00
2 changed files with 14 additions and 5 deletions
@@ -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)
@@ -31,6 +31,7 @@ HeapDict
 ImageMagick
 JAGS
 Jinja2
+Judy
 Keras
 Keras_Applications
 Keras_Preprocessing
@@ -1665,6 +1666,7 @@ fuse
 futurist
 fwupd
 fwupdate
+g2fs-utils
 gTTS-token
 gabbi
 garcon
@@ -1710,7 +1712,7 @@ gimp
 girara
 git
 git-gui
-gitdb2
+gitdb
 gitg
 gitolite
 gjs
@@ -4892,6 +4894,7 @@ rfc3987
 rhythmbox
 rinutils
 rjsmin
+rlwrap
 rng-tools
 roboto
 rofi
@@ -4984,7 +4987,7 @@ slurm
 smart_open
 smartcols
 smartmontools
-smmap2
+smmap
 snabb
 snappy
 sndio
@@ -5084,6 +5087,7 @@ swupd-probe
 swupd-search
 sxhkd
 sxiv
+symengine
 sympy
 syndication
 synergy
Author	SHA1	Message	Date
Patrick McCarty	8aa923a5a6	Replace gitdb2/smmap2 with gitdb/smmap Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2020-02-24 16:20:26 -08:00
clrbuilder	a757a26828	Update packages file for version 32390 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-02-24 18:20:28 +00:00
clrbuilder	c69acb2821	Update packages file for version 32380 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-02-21 06:09:31 +00:00
Arzhan Kinzhalin	cbb1d9688e	make koji: check remote tag exists beforehand	2020-02-20 10:17:32 -08:00
clrbuilder	9b778e9f80	Update packages file for version 32370 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-02-20 06:09:16 +00:00