Update packages file for version 32550

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)

licenses-spdx

@@ -252,6 +252,7 @@ NPL-1.1
 NPOSL-3.0
 NRL
 NTP
+NTP-0
 Naumen
 Net-SNMP
 NetCDF
@@ -264,7 +265,11 @@ OCLC-2.0
 ODC-By-1.0
 ODbL-1.0
 OFL-1.0
+OFL-1.0-RFN
+OFL-1.0-no-RFN
 OFL-1.1
+OFL-1.1-RFN
+OFL-1.1-no-RFN
 OGL-Canada-2.0
 OGL-UK-1.0
 OGL-UK-2.0
@@ -298,6 +303,7 @@ OpenSSL
 PDDL-1.0
 PHP-3.0
 PHP-3.01
+PSF-2.0
 Parity-6.0.0
 Plexus
 PostgreSQL
@@ -392,6 +398,7 @@ gSOAP-1.3b
 gnuplot
 iMatix
 libpng-2.0
+libselinux-1.0
 libtiff
 mpich2
 psfrag

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
@@ -89,10 +91,12 @@ R-AmesHousing
 R-BB
 R-BBmisc
 R-BH
+R-BMA
 R-BMS
 R-BatchJobs
 R-BayesFactor
 R-BiasedUrn
+R-BiocManager
 R-BoolNet
 R-BradleyTerry2
 R-Brobdingnag
@@ -153,6 +157,7 @@ R-NMF
 R-NMOF
 R-PKI
 R-PerformanceAnalytics
+R-R.cache
 R-R.methodsS3
 R-R.oo
 R-R.utils
@@ -167,6 +172,7 @@ R-RCurl
 R-RInside
 R-RJSONIO
 R-RNeXML
+R-RNetCDF
 R-ROCR
 R-RProtoBuf
 R-RSQLite
@@ -181,6 +187,7 @@ R-Rcpp
 R-RcppArmadillo
 R-RcppEigen
 R-RcppGSL
+R-RcppParallel
 R-RcppProgress
 R-RcppRoll
 R-RcppZiggurat
@@ -285,6 +292,7 @@ R-cmprsk
 R-cobs
 R-coda
 R-coin
+R-collections
 R-colorspace
 R-colourpicker
 R-combinat
@@ -505,6 +513,7 @@ R-labelled
 R-laeken
 R-lambda.r
 R-languageR
+R-languageserver
 R-lars
 R-later
 R-latticeExtra
@@ -591,6 +600,7 @@ R-mvoutlier
 R-mvtnorm
 R-natserv
 R-ncbit
+R-ncdf4
 R-network
 R-neuralnet
 R-nleqslv
@@ -632,6 +642,7 @@ R-phylobase
 R-phylogram
 R-phytools
 R-pillar
+R-pixmap
 R-pkgKitten
 R-pkgbuild
 R-pkgconfig
@@ -850,6 +861,7 @@ R-tidyverse
 R-tikzDevice
 R-timeDate
 R-timeSeries
+R-tinytest
 R-tinytex
 R-tis
 R-tm
@@ -895,6 +907,7 @@ R-xfun
 R-xml2
 R-xmlparsedata
 R-xopen
+R-xptr
 R-xtable
 R-xts
 R-yaml
@@ -1033,6 +1046,7 @@ apache-tomcat
 apache-zookeeper
 apipkg
 appdirs
+applaunchservices
 appstream
 appstream-glib
 apr
@@ -1210,6 +1224,7 @@ cantata
 cantor
 capnproto
 capstone
+capturer
 caribou
 case
 cassandra
@@ -1240,6 +1255,7 @@ chrony
 chrpath
 cifs-utils
 cinder
+clFFT
 clamav
 clear-config-management
 clear-font
@@ -1285,6 +1301,7 @@ clutter
 clutter-gst
 clutter-gtk
 cmake
+cmarkgfm
 cmd2
 cmocka
 cmrt
@@ -1321,6 +1338,9 @@ collectl
 colorama
 colord
 colord-gtk
+colord-kde
+colordiff
+coloredlogs
 columbiad
 comedilib
 comfortaa-fonts
@@ -1387,6 +1407,7 @@ containerd
 contextlib2
 cookies
 coreutils
+corosync
 coturn
 cotyledon
 cov-core
@@ -1412,6 +1433,7 @@ cscope
 cssselect
 ctags
 cups
+cups-bjnp
 cups-filters
 cups-pk-helper
 curl
@@ -1420,13 +1442,13 @@ cve-bin-tool
 cxxfilt
 cycler
 cyrus-sasl
-d9vk
 dapl
 darkflow
 darktable
 dash-to-dock
 dask
 datefudge
+dav1d
 db
 dbus
 dbus-broker
@@ -1452,11 +1474,13 @@ dfc
 dfu-util
 dhcp
 dialog
+diff-match-patch
 diffoscope
 diffstat
 diffutils
 digikam
 ding-libs
+dino
 direwolf
 discover
 dist-pam-configs
@@ -1474,6 +1498,7 @@ dkms
 dldt
 dldt-model-optimizer
 dlib
+dlm
 dlt-daemon
 dmap2gcode
 dmenu
@@ -1632,6 +1657,7 @@ font-util
 fontconfig
 fontforge
 fonttools
+fortune-mod
 fossil
 frameworkintegration
 freedv
@@ -1648,6 +1674,7 @@ fuse
 futurist
 fwupd
 fwupdate
+g2fs-utils
 gTTS-token
 gabbi
 garcon
@@ -1693,7 +1720,7 @@ gimp
 girara
 git
 git-gui
-gitdb2
+gitdb
 gitg
 gitolite
 gjs
@@ -1810,6 +1837,7 @@ grep
 grig
 grilo
 grilo-plugins
+grisbi
 groff
 grpc
 grpcio
@@ -1880,6 +1908,7 @@ httplib2
 httpretty
 hub
 hugo
+humanfriendly
 hunspell
 hwloc
 hyperscan
@@ -1935,9 +1964,11 @@ intel-hybrid-driver
 intel-ipsec-mb
 intel-media-driver
 intelhex
+intervaltree
 intltool
 ioc-cbc-tools
 ioping
+ioport
 iotop
 ipaddr
 ipaddress
@@ -2198,11 +2229,13 @@ kpkpass
 kplotting
 kpty
 kqtquickcharts
+kquickcharts
 krb5
 krdc
 krest
 kreversi
 krita
+kronosnet
 kross
 kruler
 krunner
@@ -2370,6 +2403,7 @@ libgpg-error
 libgphoto2
 libgpiod
 libgravatar
+libgsf
 libgsystem
 libgtop
 libgudev
@@ -2441,6 +2475,8 @@ libnumbertext
 liboauth
 libodfgen
 libogg
+libopenshot
+libopenshot-audio
 libopenzwave
 liborcus
 libosinfo
@@ -2478,6 +2514,7 @@ libseccomp
 libsecret
 libshout
 libsigc++
+libsignal-protocol-c
 libsigsegv
 libskk
 libsmbios
@@ -2495,6 +2532,7 @@ libsrtp
 libssh
 libssh2
 libstaroffice
+libstatgrab
 libstoragemgmt
 libsysstat
 libtasn1
@@ -2569,6 +2607,7 @@ linux-kvm
 linux-libc-headers
 linux-lts2017
 linux-lts2018
+linux-lts2019
 linux-mainline
 linux-oracle
 linux-preempt-rt
@@ -2692,6 +2731,7 @@ mock
 mod_perl
 mod_wsgi
 modemmanager-qt
+modules
 moka-icon-theme
 mokutil
 mongodict
@@ -3468,6 +3508,7 @@ nload
 nlopt
 nltk
 nmap
+nnn
 nodejs
 nose
 nose-cov
@@ -3482,6 +3523,7 @@ noto-cjk
 noto-emoji
 noto-fonts
 nova
+npb
 npth
 nrpe
 nspr
@@ -3491,6 +3533,7 @@ nss-pam-ldapd
 ntfs-3g
 ntl
 ntlm-auth
+ntopng
 ntp
 ntplib
 numactl
@@ -3540,6 +3583,7 @@ openjdk13
 openldap
 openmpi
 openscad
+openshot-qt
 opensm
 openssh
 openssl
@@ -3569,6 +3613,7 @@ os-xenapi
 os_vif
 osc-lib
 oset
+osinfo-db
 osinfo-db-tools
 oslo.cache
 oslo.concurrency
@@ -3591,6 +3636,7 @@ oslo.versionedobjects
 oslo.vmware
 oslosphinx
 oslotest
+osm-gps-map
 osprofiler
 ostree
 otp
@@ -3644,11 +3690,13 @@ pcmanfm
 pcmanfm-qt
 pcre
 pcre2
+pcs
 pcsc-lite
 pdns
 pdns-recursor
 pdsh
 pecan
+pep517
 pep8
 performance
 perftest
@@ -4056,6 +4104,7 @@ perl-Log-Any
 perl-Log-Contextual
 perl-Log-Dispatch
 perl-Log-Dispatch-Array
+perl-Log-Dispatch-FileRotate
 perl-Log-Log4perl
 perl-Log-Message
 perl-Log-Message-Simple
@@ -4185,6 +4234,7 @@ perl-Params-ValidationCompiler
 perl-Parse-EDID
 perl-Parse-ExuberantCTags
 perl-Parse-RecDescent
+perl-Parse-Yapp
 perl-Path-Class
 perl-Path-Tiny
 perl-Pegex
@@ -4256,6 +4306,7 @@ perl-String-Escape
 perl-String-Expand
 perl-String-Format
 perl-String-Random
+perl-String-ShellQuote
 perl-String-Similarity
 perl-String-Util
 perl-Struct-Dumb
@@ -4527,6 +4578,7 @@ php-xxtea
 php-yaml
 php-yar
 php-zip
+php-zmq
 pickleshare
 picmi
 picocom
@@ -4547,6 +4599,7 @@ pipreqs
 pixman
 pkcs11-helper
 pkg-config
+pkginfo
 plasma-browser-integration
 plasma-desktop
 plasma-discover
@@ -4582,6 +4635,7 @@ postfix
 postgis
 postgresql
 postgresql11
+postgresql12
 potrace
 povray
 powerdevil
@@ -4621,6 +4675,7 @@ pwgen
 py
 pyDesktop3
 pyOpenSSL
+pyRFC3339
 pyScss
 pyaes
 pyalsaaudio
@@ -4667,7 +4722,6 @@ pyperclip
 pypowervm
 pyquery
 pyreadline
-pyrfc3339
 pyroma
 pyroute2
 pyrsistent
@@ -4679,7 +4733,9 @@ pysnmp
 pysubnettree
 pytest
 pytest-asyncio
+pytest-cache
 pytest-cov
+pytest-flake8
 pytest-forked
 pytest-localserver
 pytest-randomly
@@ -4771,6 +4827,7 @@ qrencode
 qscintilla
 qt-creator
 qt3d
+qt5ct
 qtbase
 qtcanvas3d
 qtcharts
@@ -4825,7 +4882,9 @@ rdma-core
 re2
 re2c
 readline
+readme_renderer
 rebootmgr
+recode
 recommonmark
 redis
 redis-native
@@ -4847,6 +4906,7 @@ requests-ntlm
 requests-oauthlib
 requests-toolbelt
 requestsexceptions
+resource-agents
 responses
 rest
 restic
@@ -4858,7 +4918,9 @@ retype
 rfc3986
 rfc3987
 rhythmbox
+rinutils
 rjsmin
+rlwrap
 rng-tools
 roboto
 rofi
@@ -4951,7 +5013,7 @@ slurm
 smart_open
 smartcols
 smartmontools
-smmap2
+smmap
 snabb
 snappy
 sndio
@@ -4969,6 +5031,7 @@ source-code-pro
 source-highlight
 sox
 spandsp
+spdlog
 spectacle
 speedtest-cli
 speex
@@ -4995,6 +5058,7 @@ spi-tools
 spice
 spice-gtk
 spice-protocol
+spyder-ide
 spyder-notebook
 spyrk
 sqlalchemy-migrate
@@ -5022,6 +5086,7 @@ stoken
 stow
 strace
 stress-ng
+stringcase
 stunnel
 su-exec
 subunit
@@ -5029,6 +5094,7 @@ subunit2sql
 subversion
 sudo
 suds-jurko
+suitable
 sundials
 supertuxkart
 sure
@@ -5049,6 +5115,7 @@ swupd-probe
 swupd-search
 sxhkd
 sxiv
+symengine
 sympy
 syndication
 synergy
@@ -5154,6 +5221,8 @@ traefik
 traitlets
 tree
 trollius
+trustme
+twine
 typed_ast
 typing
 typing_extensions
@@ -5203,6 +5272,7 @@ valgrind
 vbox-integration
 vcstool
 vcversioner
+vifm
 vim
 vim-fugitive
 vim-gnupg
@@ -5342,6 +5412,7 @@ xscreensaver
 xsel
 xset
 xsetroot
+xss-lock
 xterm
 xtrans
 xvfb-run

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 "