Add diffstat in required programs check

diffstat is required to geenrate the for-review.txt

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)

Makefile.shared

@@ -68,10 +68,10 @@ endef
 # augmented for local repo support.
 define localrepoenable
 	@cp $(1) $(TOPLVL)/repo/yum.conf
-	@printf "\n\n[local]\nname=Local\nfailovermethod=priority\nenabled=1\ngpgcheck=0\n" >> $(TOPLVL)/repo/yum.conf
+	@printf "\n\n[local]\nname=Local\nfailovermethod=priority\nenabled=1\ngpgcheck=0\npriority=1\n" >> $(TOPLVL)/repo/yum.conf
 	@printf "baseurl=file://$$(realpath $(TOPLVL))/repo/\n\n" >> $(TOPLVL)/repo/yum.conf
 	@cp $(2) $(TOPLVL)/repo/clear.cfg
-	@printf "\n\n[localrepo]\nname=Local repo\nfailovermethod=priority\nenabled=1\ngpgcheck=0\n" >> $(TOPLVL)/repo/clear.cfg
+	@printf "\n\n[localrepo]\nname=Local repo\nfailovermethod=priority\nenabled=1\ngpgcheck=0\npriority=1\n" >> $(TOPLVL)/repo/clear.cfg
 	@printf "baseurl=file://$$(realpath $(TOPLVL))/repo/\n\n" >> $(TOPLVL)/repo/clear.cfg
 	@sed -i '/^"""/d; $$a"""' $(TOPLVL)/repo/clear.cfg
 endef

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
@@ -89,10 +90,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 +156,7 @@ R-NMF
 R-NMOF
 R-PKI
 R-PerformanceAnalytics
+R-R.cache
 R-R.methodsS3
 R-R.oo
 R-R.utils
@@ -167,6 +171,7 @@ R-RCurl
 R-RInside
 R-RJSONIO
 R-RNeXML
+R-RNetCDF
 R-ROCR
 R-RProtoBuf
 R-RSQLite
@@ -180,8 +185,10 @@ R-RcmdrMisc
 R-Rcpp
 R-RcppArmadillo
 R-RcppEigen
+R-RcppGSL
 R-RcppProgress
 R-RcppRoll
+R-RcppZiggurat
 R-Rdpack
 R-Rmpfr
 R-Rmpi
@@ -283,6 +290,7 @@ R-cmprsk
 R-cobs
 R-coda
 R-coin
+R-collections
 R-colorspace
 R-colourpicker
 R-combinat
@@ -503,6 +511,7 @@ R-labelled
 R-laeken
 R-lambda.r
 R-languageR
+R-languageserver
 R-lars
 R-later
 R-latticeExtra
@@ -589,6 +598,7 @@ R-mvoutlier
 R-mvtnorm
 R-natserv
 R-ncbit
+R-ncdf4
 R-network
 R-neuralnet
 R-nleqslv
@@ -605,6 +615,7 @@ R-optextras
 R-optimx
 R-optparse
 R-ordinal
+R-pROC
 R-packrat
 R-pamr
 R-parsedate
@@ -629,6 +640,7 @@ R-phylobase
 R-phylogram
 R-phytools
 R-pillar
+R-pixmap
 R-pkgKitten
 R-pkgbuild
 R-pkgconfig
@@ -847,6 +859,7 @@ R-tidyverse
 R-tikzDevice
 R-timeDate
 R-timeSeries
+R-tinytest
 R-tinytex
 R-tis
 R-tm
@@ -892,6 +905,7 @@ R-xfun
 R-xml2
 R-xmlparsedata
 R-xopen
+R-xptr
 R-xtable
 R-xts
 R-yaml
@@ -1030,6 +1044,7 @@ apache-tomcat
 apache-zookeeper
 apipkg
 appdirs
+applaunchservices
 appstream
 appstream-glib
 apr
@@ -1237,6 +1252,7 @@ chrony
 chrpath
 cifs-utils
 cinder
+clFFT
 clamav
 clear-config-management
 clear-font
@@ -1318,6 +1334,8 @@ collectl
 colorama
 colord
 colord-gtk
+colord-kde
+colordiff
 columbiad
 comedilib
 comfortaa-fonts
@@ -1344,6 +1362,7 @@ compat-ilmbase-soname23
 compat-intel-gmmlib-soname1
 compat-ipset-soname10
 compat-iptables-soname0.1.0
+compat-libevent-soname6
 compat-libgit2-soname27
 compat-libical-soname2
 compat-libidn-soname11
@@ -1358,7 +1377,7 @@ compat-llvm-soname7
 compat-mariadb-soname18
 compat-mpfr-soname4
 compat-nettle-soname6
-compat-openssl-soname-10
+compat-opencv-soname41
 compat-proj-soname13
 compat-protobuf-soname14
 compat-protobuf-soname15
@@ -1448,11 +1467,13 @@ dfc
 dfu-util
 dhcp
 dialog
+diff-match-patch
 diffoscope
 diffstat
 diffutils
 digikam
 ding-libs
+dino
 direwolf
 discover
 dist-pam-configs
@@ -1469,6 +1490,7 @@ django_compressor
 dkms
 dldt
 dldt-model-optimizer
+dlib
 dlt-daemon
 dmap2gcode
 dmenu
@@ -1519,6 +1541,7 @@ dxvk
 dyskctl
 e2fsprogs
 earlyapp
+earlyoom
 ebtables
 ecdsa
 ed
@@ -1547,7 +1570,6 @@ envs
 eog
 eog-plugins
 epm
-epydoc
 eternalegypt
 ethtool
 etr
@@ -1627,8 +1649,8 @@ font-util
 fontconfig
 fontforge
 fonttools
+fortune-mod
 fossil
-fox
 frameworkintegration
 freedv
 freeglut
@@ -1644,6 +1666,7 @@ fuse
 futurist
 fwupd
 fwupdate
+g2fs-utils
 gTTS-token
 gabbi
 garcon
@@ -1684,11 +1707,12 @@ gftp
 ghc
 ghostscript
 giflib
+gifsicle
 gimp
 girara
 git
 git-gui
-gitdb2
+gitdb
 gitg
 gitolite
 gjs
@@ -1754,7 +1778,7 @@ gnome-shell-impatience
 gnome-software
 gnome-system-monitor
 gnome-terminal
-gnome-themes-standard
+gnome-themes-extra
 gnome-todo
 gnome-tweaks
 gnome-user-docs
@@ -1805,6 +1829,7 @@ grep
 grig
 grilo
 grilo-plugins
+grisbi
 groff
 grpc
 grpcio
@@ -1930,9 +1955,11 @@ intel-hybrid-driver
 intel-ipsec-mb
 intel-media-driver
 intelhex
+intervaltree
 intltool
 ioc-cbc-tools
 ioping
+ioport
 iotop
 ipaddr
 ipaddress
@@ -1986,6 +2013,7 @@ jmespath
 joblib
 joe
 josepy
+jpegoptim
 jq
 json-c
 json-glib
@@ -2192,6 +2220,7 @@ kpkpass
 kplotting
 kpty
 kqtquickcharts
+kquickcharts
 krb5
 krdc
 krest
@@ -2200,6 +2229,7 @@ krita
 kross
 kruler
 krunner
+krusader
 kscreen
 kscreenlocker
 kservice
@@ -2297,6 +2327,7 @@ libbpf
 libbsd
 libburn
 libbytesize
+libcacard
 libcanberra
 libcap
 libcap-ng
@@ -2352,8 +2383,6 @@ libgee
 libgeotiff
 libgepub
 libgfortran-avx
-libgfortran-compat-soname3
-libgfortran-compat-soname4
 libgit2
 libgit2-glib
 libglade
@@ -2364,6 +2393,7 @@ libgpg-error
 libgphoto2
 libgpiod
 libgravatar
+libgsf
 libgsystem
 libgtop
 libgudev
@@ -2447,6 +2477,7 @@ libpinyin
 libpipeline
 libplacebo
 libpng
+libportal
 libpsl
 libpthread-stubs
 libpwquality
@@ -2471,6 +2502,7 @@ libseccomp
 libsecret
 libshout
 libsigc++
+libsignal-protocol-c
 libsigsegv
 libskk
 libsmbios
@@ -2562,6 +2594,7 @@ linux-kvm
 linux-libc-headers
 linux-lts2017
 linux-lts2018
+linux-lts2019
 linux-mainline
 linux-oracle
 linux-preempt-rt
@@ -2685,6 +2718,7 @@ mock
 mod_perl
 mod_wsgi
 modemmanager-qt
+modules
 moka-icon-theme
 mokutil
 mongodict
@@ -3450,6 +3484,7 @@ nginx-mainline
 nginx-upload-module
 nginx_cookie_flag_module
 ngraph
+ngx-fancyindex
 ngx_brotli
 ngx_http_auth_pam_module
 ngx_http_enhanced_memcached_module
@@ -3483,6 +3518,7 @@ nss-pam-ldapd
 ntfs-3g
 ntl
 ntlm-auth
+ntopng
 ntp
 ntplib
 numactl
@@ -3561,6 +3597,7 @@ os-xenapi
 os_vif
 osc-lib
 oset
+osinfo-db
 osinfo-db-tools
 oslo.cache
 oslo.concurrency
@@ -3583,6 +3620,7 @@ oslo.versionedobjects
 oslo.vmware
 oslosphinx
 oslotest
+osm-gps-map
 osprofiler
 ostree
 otp
@@ -3632,12 +3670,14 @@ pavucontrol
 pbr
 pbzip2
 pciutils
+pcmanfm
 pcmanfm-qt
 pcre
 pcre2
 pcsc-lite
 pdns
 pdns-recursor
+pdsh
 pecan
 pep8
 performance
@@ -3678,6 +3718,7 @@ perl-Audio-Wav
 perl-Authen-NTLM
 perl-Authen-SASL
 perl-B-COW
+perl-B-Debug
 perl-B-Hooks-EndOfScope
 perl-B-Hooks-OP-Check
 perl-B-Keywords
@@ -3929,6 +3970,7 @@ perl-FreezeThaw
 perl-Frontier-RPC
 perl-Future
 perl-Future-IO-ImplBase
+perl-GD
 perl-GD-Barcode
 perl-GIS-Distance
 perl-GSSAPI
@@ -4044,6 +4086,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
@@ -4195,6 +4238,7 @@ perl-Pod-Spell
 perl-Pod-Strip
 perl-PostScript-File
 perl-Proc-InvokeEditor
+perl-Proc-ProcessTable
 perl-Proc-Wait3
 perl-Protocol-OSC
 perl-Quota
@@ -4235,6 +4279,7 @@ perl-Specio
 perl-Spiffy
 perl-Statistics-Basic
 perl-Statistics-CaseResampling
+perl-Storable
 perl-Stream-Buffered
 perl-String-Approx
 perl-String-CamelCase
@@ -4279,6 +4324,7 @@ perl-Term-UI
 perl-Test-Assertions
 perl-Test-Base
 perl-Test-CleanNamespaces
+perl-Test-Command
 perl-Test-Compile
 perl-Test-Deep
 perl-Test-Differences
@@ -4287,6 +4333,7 @@ perl-Test-FailWarnings
 perl-Test-Fatal
 perl-Test-File
 perl-Test-File-ShareDir-Dist
+perl-Test-Fork
 perl-Test-Identity
 perl-Test-Inter
 perl-Test-LeakTrace
@@ -4412,6 +4459,7 @@ perl-XML-XPathEngine
 perl-XString
 perl-YAML
 perl-YAML-LibYAML
+perl-YAML-PP
 perl-YAML-Syck
 perl-YAML-Tiny
 perl-accessors
@@ -4549,6 +4597,7 @@ plzip
 pm-graph
 pmdk
 pmix
+pngcrush
 po4a
 polkit
 polkit-kde-agent
@@ -4564,6 +4613,7 @@ postfix
 postgis
 postgresql
 postgresql11
+postgresql12
 potrace
 povray
 powerdevil
@@ -4753,6 +4803,7 @@ qrencode
 qscintilla
 qt-creator
 qt3d
+qt5ct
 qtbase
 qtcanvas3d
 qtcharts
@@ -4808,6 +4859,7 @@ re2
 re2c
 readline
 rebootmgr
+recode
 recommonmark
 redis
 redis-native
@@ -4840,7 +4892,9 @@ retype
 rfc3986
 rfc3987
 rhythmbox
+rinutils
 rjsmin
+rlwrap
 rng-tools
 roboto
 rofi
@@ -4871,6 +4925,7 @@ s2tc
 s3fs-fuse
 s3transfer
 sahara
+salt
 samba
 samtools
 sane-backends
@@ -4928,10 +4983,11 @@ singledispatch
 sip
 six
 slang
+slurm
 smart_open
 smartcols
 smartmontools
-smmap2
+smmap
 snabb
 snappy
 sndio
@@ -4949,6 +5005,7 @@ source-code-pro
 source-highlight
 sox
 spandsp
+spdlog
 spectacle
 speedtest-cli
 speex
@@ -4975,6 +5032,7 @@ spi-tools
 spice
 spice-gtk
 spice-protocol
+spyder-ide
 spyder-notebook
 spyrk
 sqlalchemy-migrate
@@ -4987,10 +5045,12 @@ sshpass
 ssocr
 sssd
 ssw
+stacer
 stack
 startup-notification
 statsd
 statsmodels
+steam-devices
 stellarium
 step
 stestr
@@ -5021,11 +5081,13 @@ sweeper
 swift
 swig
 swupd-client
+swupd-client-pre-release
 swupd-overdue
 swupd-probe
 swupd-search
 sxhkd
 sxiv
+symengine
 sympy
 syndication
 synergy
@@ -5180,6 +5242,7 @@ valgrind
 vbox-integration
 vcstool
 vcversioner
+vifm
 vim
 vim-fugitive
 vim-gnupg
@@ -5319,6 +5382,7 @@ xscreensaver
 xsel
 xset
 xsetroot
+xss-lock
 xterm
 xtrans
 xvfb-run
@@ -5340,6 +5404,7 @@ yelp-xsl
 ykclient
 ytnef
 zVMCloudConnector
+zabbix
 zake
 zathura
 zathura-pdf-poppler

patchfilter.py

@@ -265,6 +265,8 @@ def main():
     zap_line_in_file_start(".spec", "%description license")
     zap_line_in_file_start(".spec", "%package doc")
     zap_line_in_file_start(".spec", "cp -a ")
+    zap_line_in_file_start(".spec", "cd %{_builddir}/")
+    zap_line_in_file_start(".spec", "export GCC_IGNORE_WERROR=1")
  
     zap_line_in_file_start("b/Makefile", "URL =")
     zap_line_in_file_start("b/Makefile", "PKG_NAME :=")
@@ -293,6 +295,7 @@ def main():
     zap_line_in_file("b/options.conf", "conservative_flags = false")
     zap_line_in_file("b/options.conf", "# dev package requires the extras to be installed")
     zap_line_in_file("b/options.conf", "dev_requires_extras = false")
+    zap_line_in_file("b/options.conf", "nodebug = false")
     zap_line_in_file("b/options.conf", "# pass -ffast-math to compiler")
     zap_line_in_file("b/options.conf", "fast-math = false")
     zap_line_in_file("b/options.conf", "# optimize build for speed over size")
@@ -322,11 +325,12 @@ def main():
     zap_line_in_file("b/options.conf", "# add clang flags")
     zap_line_in_file("b/options.conf", "use_clang = false")
     zap_line_in_file("b/options.conf", "# configure build for lto")
-    zap_line_in_file("b/options.conf", "use_lto = false")
+    zap_line_in_file("b/options.conf", "use_lto = true")
     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", "+nodebug = false")
+    zap_line_in_file("b/options.conf", "nodebug = false")
+    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.")

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 "