Add ciso8601

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

@@ -1,5 +1,4 @@
 AVB-AudioModules
-AVBStreamHandler
 Babel
 Botan
 CGAL
@@ -31,6 +30,7 @@ HeapDict
 ImageMagick
 JAGS
 Jinja2
+Judy
 Keras
 Keras_Applications
 Keras_Preprocessing
@@ -58,6 +58,7 @@ OpenCSG
 OpenColorIO
 OpenIPMI
 OpenSP
+Pacemaker
 PackageKit
 ParaView
 Paste
@@ -155,6 +156,7 @@ R-NMF
 R-NMOF
 R-PKI
 R-PerformanceAnalytics
+R-QUIC
 R-R.cache
 R-R.methodsS3
 R-R.oo
@@ -185,6 +187,7 @@ R-Rcpp
 R-RcppArmadillo
 R-RcppEigen
 R-RcppGSL
+R-RcppParallel
 R-RcppProgress
 R-RcppRoll
 R-RcppZiggurat
@@ -427,6 +430,7 @@ R-futile.options
 R-future
 R-g.data
 R-gam
+R-gamlss.data
 R-gamm4
 R-gbRd
 R-gbm
@@ -434,6 +438,7 @@ R-gbutils
 R-gclus
 R-gdata
 R-gdtools
+R-gee
 R-geepack
 R-geiger
 R-generics
@@ -491,10 +496,12 @@ R-inum
 R-invgamma
 R-ipred
 R-irlba
+R-isoband
 R-iterators
 R-janitor
 R-joineR
 R-joineRML
+R-jomo
 R-jpeg
 R-jqr
 R-jsonlite
@@ -572,6 +579,7 @@ R-mirt
 R-misc3d
 R-miscF
 R-miscTools
+R-mitml
 R-mitools
 R-mixtools
 R-mlbench
@@ -617,6 +625,7 @@ R-ordinal
 R-pROC
 R-packrat
 R-pamr
+R-pan
 R-parsedate
 R-partitions
 R-party
@@ -741,6 +750,7 @@ R-rjstat
 R-rlang
 R-rmarkdown
 R-rmatio
+R-rmeta
 R-rms
 R-rmutil
 R-rncl
@@ -821,6 +831,7 @@ R-spelling
 R-spls
 R-stable
 R-stabledist
+R-stabs
 R-stargazer
 R-startupmsg
 R-statip
@@ -899,6 +910,7 @@ R-whoami
 R-wikitaxa
 R-withr
 R-wooldridge
+R-wordcloud
 R-worrms
 R-xfun
 R-xml2
@@ -1024,6 +1036,7 @@ alembic
 alsa-firmware
 alsa-lib
 alsa-plugins
+alsa-ucm-conf
 alsa-utils
 amazon-efs-utils
 amqp
@@ -1062,6 +1075,7 @@ arpack-ng
 artikulate
 asciidoc
 asciinema
+asgiref
 asio
 asn1crypto
 aspell
@@ -1221,6 +1235,7 @@ cantata
 cantor
 capnproto
 capstone
+capturer
 caribou
 case
 cassandra
@@ -1251,6 +1266,7 @@ chrony
 chrpath
 cifs-utils
 cinder
+ciso8601
 clFFT
 clamav
 clear-config-management
@@ -1297,6 +1313,7 @@ clutter
 clutter-gst
 clutter-gtk
 cmake
+cmarkgfm
 cmd2
 cmocka
 cmrt
@@ -1335,11 +1352,13 @@ colord
 colord-gtk
 colord-kde
 colordiff
+coloredlogs
 columbiad
 comedilib
 comfortaa-fonts
 commonmark
 compat-SDL2-soname1
+compat-boost-soname1.68.0
 compat-cryptsetup-soname4
 compat-curl-gnutls-soname4
 compat-double-conversion-soname1
@@ -1401,6 +1420,7 @@ containerd
 contextlib2
 cookies
 coreutils
+corosync
 coturn
 cotyledon
 cov-core
@@ -1426,6 +1446,7 @@ cscope
 cssselect
 ctags
 cups
+cups-bjnp
 cups-filters
 cups-pk-helper
 curl
@@ -1434,13 +1455,13 @@ cve-bin-tool
 cxxfilt
 cycler
 cyrus-sasl
-d9vk
 dapl
 darkflow
 darktable
 dash-to-dock
 dask
 datefudge
+dav1d
 db
 dbus
 dbus-broker
@@ -1482,6 +1503,7 @@ distro
 dj-database-url
 django-appconf
 django-babel
+django-debreach
 django-discover-runner
 django-nose
 django-pyscss
@@ -1490,6 +1512,7 @@ dkms
 dldt
 dldt-model-optimizer
 dlib
+dlm
 dlt-daemon
 dmap2gcode
 dmenu
@@ -1564,6 +1587,7 @@ embree
 empy
 enchant
 enlightenment
+enmerkar
 entrypoints
 envs
 eog
@@ -1665,6 +1689,7 @@ fuse
 futurist
 fwupd
 fwupdate
+g2fs-utils
 gTTS-token
 gabbi
 garcon
@@ -1710,7 +1735,7 @@ gimp
 girara
 git
 git-gui
-gitdb2
+gitdb
 gitg
 gitolite
 gjs
@@ -1898,6 +1923,7 @@ httplib2
 httpretty
 hub
 hugo
+humanfriendly
 hunspell
 hwloc
 hyperscan
@@ -2000,7 +2026,10 @@ iwd
 ixion
 jack2
 jansson
+jaraco.classes
+jaraco.collections
 jaraco.functools
+jaraco.text
 jarn.viewdoc
 jdcal
 jedi
@@ -2224,6 +2253,7 @@ krdc
 krest
 kreversi
 krita
+kronosnet
 kross
 kruler
 krunner
@@ -2380,7 +2410,6 @@ libgdata
 libgee
 libgeotiff
 libgepub
-libgfortran-avx
 libgit2
 libgit2-glib
 libglade
@@ -2434,6 +2463,7 @@ liblxqt
 libmaxminddb
 libmbim
 libmediaart
+libmemcached
 libmetalink
 libmicrohttpd
 libmnl
@@ -2463,6 +2493,8 @@ libnumbertext
 liboauth
 libodfgen
 libogg
+libopenshot
+libopenshot-audio
 libopenzwave
 liborcus
 libosinfo
@@ -2518,6 +2550,7 @@ libsrtp
 libssh
 libssh2
 libstaroffice
+libstatgrab
 libstoragemgmt
 libsysstat
 libtasn1
@@ -2625,6 +2658,7 @@ ltrace
 lttng-tools
 lttng-ust
 lua
+lua-nginx-module
 lua52
 lualgi
 luarocks
@@ -3479,6 +3513,7 @@ nftables
 nghttp2
 nginx
 nginx-mainline
+nginx-rtmp-module
 nginx-upload-module
 nginx_cookie_flag_module
 ngraph
@@ -3493,6 +3528,7 @@ nload
 nlopt
 nltk
 nmap
+nnn
 nodejs
 nose
 nose-cov
@@ -3507,6 +3543,7 @@ noto-cjk
 noto-emoji
 noto-fonts
 nova
+npb
 npth
 nrpe
 nspr
@@ -3566,6 +3603,7 @@ openjdk13
 openldap
 openmpi
 openscad
+openshot-qt
 opensm
 openssh
 openssl
@@ -3672,11 +3710,13 @@ pcmanfm
 pcmanfm-qt
 pcre
 pcre2
+pcs
 pcsc-lite
 pdns
 pdns-recursor
 pdsh
 pecan
+pep517
 pep8
 performance
 perftest
@@ -4186,6 +4226,7 @@ perl-Number-Format
 perl-Number-Misc
 perl-Number-WithError
 perl-Object-Accessor
+perl-Object-Remote
 perl-Object-Signature
 perl-PDF-API2
 perl-PDF-Table
@@ -4214,6 +4255,7 @@ perl-Params-ValidationCompiler
 perl-Parse-EDID
 perl-Parse-ExuberantCTags
 perl-Parse-RecDescent
+perl-Parse-Yapp
 perl-Path-Class
 perl-Path-Tiny
 perl-Pegex
@@ -4285,6 +4327,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
@@ -4305,6 +4348,7 @@ perl-Sys-Mmap
 perl-Sys-SigAction
 perl-Sys-Statistics-Linux
 perl-System-Command
+perl-Systemd-Daemon
 perl-TAP-Formatter-HTML
 perl-TAP-Harness-Archive
 perl-Taint-Util
@@ -4325,6 +4369,7 @@ perl-Test-CleanNamespaces
 perl-Test-Command
 perl-Test-Compile
 perl-Test-Deep
+perl-Test-DiagINC
 perl-Test-Differences
 perl-Test-Exception
 perl-Test-FailWarnings
@@ -4524,6 +4569,7 @@ php-krb5
 php-lua
 php-lzf
 php-mailparse
+php-memcached
 php-mongodb
 php-msgpack
 php-oauth
@@ -4556,6 +4602,7 @@ php-xxtea
 php-yaml
 php-yar
 php-zip
+php-zmq
 pickleshare
 picmi
 picocom
@@ -4576,6 +4623,7 @@ pipreqs
 pixman
 pkcs11-helper
 pkg-config
+pkginfo
 plasma-browser-integration
 plasma-desktop
 plasma-discover
@@ -4645,12 +4693,14 @@ ptyprocess
 pugixml
 pulseaudio
 pulsectl
+pure-sasl
 purpose
 pv
 pwgen
 py
 pyDesktop3
 pyOpenSSL
+pyRFC3339
 pyScss
 pyaes
 pyalsaaudio
@@ -4694,10 +4744,10 @@ pyotp
 pypandoc
 pyparsing
 pyperclip
+pyperf
 pypowervm
 pyquery
 pyreadline
-pyrfc3339
 pyroma
 pyroute2
 pyrsistent
@@ -4709,7 +4759,9 @@ pysnmp
 pysubnettree
 pytest
 pytest-asyncio
+pytest-cache
 pytest-cov
+pytest-flake8
 pytest-forked
 pytest-localserver
 pytest-randomly
@@ -4725,6 +4777,7 @@ python-augeas
 python-barbicanclient
 python-ceilometerclient
 python-cinderclient
+python-constraint
 python-coveralls
 python-crfsuite
 python-dateutil
@@ -4738,8 +4791,10 @@ python-glanceclient
 python-graphviz
 python-heatclient
 python-hwinfo
+python-jsonrpc-server
 python-kconfiglib
 python-keystoneclient
+python-language-server
 python-ldap
 python-magic
 python-magnumclient
@@ -4755,7 +4810,6 @@ python-openid
 python-openstackclient
 python-openzwave
 python-pcre
-python-perf
 python-pkgconfig
 python-pocketlint
 python-polib
@@ -4856,6 +4910,7 @@ rdma-core
 re2
 re2c
 readline
+readme_renderer
 rebootmgr
 recode
 recommonmark
@@ -4879,6 +4934,7 @@ requests-ntlm
 requests-oauthlib
 requests-toolbelt
 requestsexceptions
+resource-agents
 responses
 rest
 restic
@@ -4892,6 +4948,7 @@ rfc3987
 rhythmbox
 rinutils
 rjsmin
+rlwrap
 rng-tools
 roboto
 rofi
@@ -4984,13 +5041,14 @@ slurm
 smart_open
 smartcols
 smartmontools
-smmap2
+smmap
 snabb
 snappy
 sndio
 snitun
 snowballstemmer
 socat
+sof-bin
 solid
 sonnet
 sortedcontainers
@@ -5030,6 +5088,7 @@ spice
 spice-gtk
 spice-protocol
 spyder-ide
+spyder-kernels
 spyder-notebook
 spyrk
 sqlalchemy-migrate
@@ -5057,6 +5116,7 @@ stoken
 stow
 strace
 stress-ng
+stringcase
 stunnel
 su-exec
 subunit
@@ -5064,6 +5124,7 @@ subunit2sql
 subversion
 sudo
 suds-jurko
+suitable
 sundials
 supertuxkart
 sure
@@ -5084,6 +5145,7 @@ swupd-probe
 swupd-search
 sxhkd
 sxiv
+symengine
 sympy
 syndication
 synergy
@@ -5189,6 +5251,8 @@ traefik
 traitlets
 tree
 trollius
+trustme
+twine
 typed_ast
 typing
 typing_extensions
@@ -5297,6 +5361,7 @@ wpa_supplicant
 wrapt
 wsgi_intercept
 wsjtx
+wurlitzer
 wxWidgets
 x11perf
 x11vnc

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]")
@@ -329,8 +351,13 @@ def main():
     zap_line_in_file("b/options.conf", "# require package verification for build")
     zap_line_in_file("b/options.conf", "verify_required = true")
     zap_line_in_file("b/options.conf", "# do not generate debuginfo for this package")
+    zap_line_in_file("b/options.conf", "# configure build also for openmpi")
+    zap_line_in_file("b/options.conf", "openmpi = false")
+    zap_line_in_file("b/options.conf", "alias =")
+    zap_line_in_file("b/options.conf", "alias = ")
     zap_line_in_file("b/options.conf", "nodebug = false")
     zap_line_in_file("b/options.conf", "domain =")
+    zap_line_in_file("b/options.conf", "domain = ")
 
     zap_line_in_file("b/buildreq_add", "# This file contains additional build requirements that did not get")
     zap_line_in_file("b/buildreq_add", "# picked up automatically. One name per line, no whitespace.")
@@ -358,7 +385,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 "