Update packages file for version 32530

Signed-off-by: clrbuilder <clrbuilder@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
@@ -58,6 +59,7 @@ OpenCSG
 OpenColorIO
 OpenIPMI
 OpenSP
+Pacemaker
 PackageKit
 ParaView
 Paste
@@ -185,6 +187,7 @@ R-Rcpp
 R-RcppArmadillo
 R-RcppEigen
 R-RcppGSL
+R-RcppParallel
 R-RcppProgress
 R-RcppRoll
 R-RcppZiggurat
@@ -1221,6 +1224,7 @@ cantata
 cantor
 capnproto
 capstone
+capturer
 caribou
 case
 cassandra
@@ -1335,6 +1339,7 @@ colord
 colord-gtk
 colord-kde
 colordiff
+coloredlogs
 columbiad
 comedilib
 comfortaa-fonts
@@ -1401,6 +1406,7 @@ containerd
 contextlib2
 cookies
 coreutils
+corosync
 coturn
 cotyledon
 cov-core
@@ -1426,6 +1432,7 @@ cscope
 cssselect
 ctags
 cups
+cups-bjnp
 cups-filters
 cups-pk-helper
 curl
@@ -1434,13 +1441,13 @@ cve-bin-tool
 cxxfilt
 cycler
 cyrus-sasl
-d9vk
 dapl
 darkflow
 darktable
 dash-to-dock
 dask
 datefudge
+dav1d
 db
 dbus
 dbus-broker
@@ -1490,6 +1497,7 @@ dkms
 dldt
 dldt-model-optimizer
 dlib
+dlm
 dlt-daemon
 dmap2gcode
 dmenu
@@ -1665,6 +1673,7 @@ fuse
 futurist
 fwupd
 fwupdate
+g2fs-utils
 gTTS-token
 gabbi
 garcon
@@ -1710,7 +1719,7 @@ gimp
 girara
 git
 git-gui
-gitdb2
+gitdb
 gitg
 gitolite
 gjs
@@ -1898,6 +1907,7 @@ httplib2
 httpretty
 hub
 hugo
+humanfriendly
 hunspell
 hwloc
 hyperscan
@@ -2224,6 +2234,7 @@ krdc
 krest
 kreversi
 krita
+kronosnet
 kross
 kruler
 krunner
@@ -2463,6 +2474,8 @@ libnumbertext
 liboauth
 libodfgen
 libogg
+libopenshot
+libopenshot-audio
 libopenzwave
 liborcus
 libosinfo
@@ -2518,6 +2531,7 @@ libsrtp
 libssh
 libssh2
 libstaroffice
+libstatgrab
 libstoragemgmt
 libsysstat
 libtasn1
@@ -3493,6 +3507,7 @@ nload
 nlopt
 nltk
 nmap
+nnn
 nodejs
 nose
 nose-cov
@@ -3507,6 +3522,7 @@ noto-cjk
 noto-emoji
 noto-fonts
 nova
+npb
 npth
 nrpe
 nspr
@@ -3672,11 +3688,13 @@ pcmanfm
 pcmanfm-qt
 pcre
 pcre2
+pcs
 pcsc-lite
 pdns
 pdns-recursor
 pdsh
 pecan
+pep517
 pep8
 performance
 perftest
@@ -4214,6 +4232,7 @@ perl-Params-ValidationCompiler
 perl-Parse-EDID
 perl-Parse-ExuberantCTags
 perl-Parse-RecDescent
+perl-Parse-Yapp
 perl-Path-Class
 perl-Path-Tiny
 perl-Pegex
@@ -4879,6 +4898,7 @@ requests-ntlm
 requests-oauthlib
 requests-toolbelt
 requestsexceptions
+resource-agents
 responses
 rest
 restic
@@ -4892,6 +4912,7 @@ rfc3987
 rhythmbox
 rinutils
 rjsmin
+rlwrap
 rng-tools
 roboto
 rofi
@@ -4984,7 +5005,7 @@ slurm
 smart_open
 smartcols
 smartmontools
-smmap2
+smmap
 snabb
 snappy
 sndio
@@ -5057,6 +5078,7 @@ stoken
 stow
 strace
 stress-ng
+stringcase
 stunnel
 su-exec
 subunit
@@ -5064,6 +5086,7 @@ subunit2sql
 subversion
 sudo
 suds-jurko
+suitable
 sundials
 supertuxkart
 sure
@@ -5084,6 +5107,7 @@ swupd-probe
 swupd-search
 sxhkd
 sxiv
+symengine
 sympy
 syndication
 synergy
@@ -5189,6 +5213,7 @@ traefik
 traitlets
 tree
 trollius
+trustme
 typed_ast
 typing
 typing_extensions

patchfilter.py

@@ -102,6 +102,22 @@ def zap_entire_file_end(filename):
         if file.endswith(filename):
             files.remove(file)                
             
+def zap_line_in_file_substring(filename, match):
+    global header
+    global files
+    global files_chunks
+    global files_header
+    for file in files:
+        if file.endswith(filename):
+            for chunk in files_chunks[file]:
+                to_delete = list()
+                for line in chunk:
+                    if match in line:
+                        to_delete.append(line)
+                for line in to_delete:
+                    chunk.remove(line)
+            
+
 def zap_line_in_file(filename, match):
     global header
     global files
@@ -209,6 +225,11 @@ def main():
     zap_entire_file_end("xz.sig")
     zap_entire_file_end("gz.sig")
     zap_entire_file_end("bz2.sig")
+    zap_entire_file_end("xz.asc")
+    zap_entire_file_end("gz.asc")
+    zap_entire_file_end("bz2.asc")
+    
+    zap_entire_file_end(".pkey")
     
     zap_line_in_file("b/testresults", "Total : 0")
     zap_line_in_file("b/testresults", "Pass : 0")
@@ -273,6 +294,7 @@ def main():
 
     zap_line_in_file("b/options.conf", "archives = ")
     zap_line_in_file("b/options.conf", "giturl = ")
+    zap_line_in_file("b/options.conf", "url = ")
     zap_line_in_file("b/options.conf", "[package]")
     zap_line_in_file("b/options.conf", "")
     zap_line_in_file("b/options.conf", "[autospec]")
@@ -358,7 +380,9 @@ def main():
     zap_entire_file("b/whatrequires")
     zap_entire_file("b/versions")
     zap_entire_file("b/.gitignore")
+    
 
+    zap_line_in_file_substring(".spec", "%{buildroot}/usr/share/package-licenses")   # version number change in license copy
     zap_empty_chunks()
     
     print_all()

user-setup.sh

@@ -102,7 +102,7 @@ fi
 
 required_progs() {
   local bindir="/usr/bin"
-  for f in git mock rpm rpmbuild ; do
+  for f in git mock rpm rpmbuild diffstat ; do
     [ ! -x "${bindir}/${f}" ] && missing+="${f} "
   done
   [ "$PEM" ] && [ ! -x /usr/bin/koji ] && missing+="koji "