Update packages file for version 20530

Signed-off-by: clrbuilder <david.j.klimesh@intel.com>

Makefile

@@ -15,7 +15,7 @@ endif
 
 update:
 	curl -f -o packages ${BASE_URL}/source/package-sources
-	cut -f1 packages | LC_ALL=en_US.utf8 sort > packages.new && mv packages.new packages
+	cut -f1 packages | LC_ALL=C sort > packages.new && mv packages.new packages
 
 spdx:
 	curl -s spdx.org/licenses/ | sed '0,/<tbody>/d;/<\/tbody>/q;s/<tr>/\f/g;s/$$/,/g;s/<[^>]*>//g' | awk 'BEGIN{RS="\f";FS=","} {print $$4}' | sed '/^$$/d;s/^[ ]*//' > spdx

Makefile.common

@@ -148,7 +148,7 @@ autospec: pullrebase
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
 		exit 1; \
 	fi
-	@printf 'PKG_NAME := %s\nURL = %s\n\n\ninclude ../common/Makefile.common\n' $(PKG_NAME) '$(firstword $(value NEWURL) $(value URL))' > Makefile
+	@printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(PKG_NAME) '$(firstword $(value NEWURL) $(value URL))' '$(value ARCHIVES)' > Makefile
 	python3 $(TOPLVL)/projects/autospec/autospec/autospec.py -t . --integrity \
 		${NON_INTERACTIVE} --config "$(AUTOSPEC_CONF)" ${SKIP_GIT} \
 		$(firstword $(NEWURL) $(URL)) --name $(PKG_NAME) ${CLEANUP} \
@@ -238,10 +238,13 @@ prekoji-checks:
 koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
+	@if ! git branch | grep -q -E '^\* master'; then \
+		echo "Error: Must be on the master branch to submit to koji" >&2; \
+		exit 1; \
+	fi
 	git pull --rebase
 	git tag $(SRPMVERS)
-	git push --follow-tags
-	git push --tags
+	git push origin master refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)
 
 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the

Makefile.toplevel

@@ -189,14 +189,14 @@ provides:
 #help process. For more information about autospec, see the project page on Github https://github.com/clearlinux/autospec
 autospecnew:
 	@if [ -z $(NAME) ] || [ -z $(URL) ]; then \
-		echo "Please specify NAME and URL"; \
+		echo "Please specify NAME and URL. The ARCHIVES variable is optional."; \
 		exit 1; \
 	fi
 	@git clone $(PKG_BASE_URL)/$(NAME) $(TOPLVL)/packages/$(NAME) &> /dev/null || true
 	@if [ ! -d $(TOPLVL)/packages/$(NAME)/.git ]; then \
 		echo "no remote repository found, creating new package repository and running autospec"; \
 		mkdir -p $(TOPLVL)/packages/$(NAME); \
-		printf 'PKG_NAME := %s\nURL = %s\n\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
+		printf 'PKG_NAME := %s\nURL = %s\nARCHIVES = %s\n\ninclude ../common/Makefile.common\n' $(NAME) '$(value URL)' '$(value ARCHIVES)' > $(TOPLVL)/packages/$(NAME)/Makefile; \
 		python3 $(TOPLVL)/projects/autospec/autospec/autospec.py --integrity -t packages/$(NAME) --config $(AUTOSPEC_CONF) $(URL) --name $(NAME); \
 		$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
 	else \

packages

@@ -1,3 +1,180 @@
+Babel
+CUnit
+Cheetah
+ConfigArgParse
+Cython
+FreeRDP
+GConf
+Jinja2
+Keras
+LS_COLORS
+LVM2
+LibVNCServer
+Linux-PAM
+LuaJIT
+Mako
+Markdown
+MarkupSafe
+ModemManager
+MonkeyType
+MySQL-python
+NetworkManager
+NetworkManager-openconnect
+OpenSP
+Paste
+PasteDeploy
+Pillow
+PyQt5
+PyWavelets
+PyYAML
+Pygments
+QtAwesome
+QtPy
+R
+R-BH
+R-Cairo
+R-DBI
+R-IRdisplay
+R-IRkernel
+R-MatrixModels
+R-R6
+R-RColorBrewer
+R-RCurl
+R-Rcpp
+R-RcppEigen
+R-SparseM
+R-TH.data
+R-TTR
+R-XML
+R-assertthat
+R-backports
+R-base64enc
+R-bitops
+R-brew
+R-car
+R-chron
+R-colorspace
+R-commonmark
+R-crayon
+R-curl
+R-deepnet
+R-desc
+R-devtools
+R-dichromat
+R-digest
+R-dynlm
+R-e1071
+R-evaluate
+R-foreach
+R-formatR
+R-ggplot2
+R-git2r
+R-glmnet
+R-gtable
+R-gtools
+R-highr
+R-hms
+R-htmltools
+R-httpuv
+R-httr
+R-iterators
+R-jsonlite
+R-knitr
+R-labeling
+R-lazyeval
+R-lme4
+R-lmtest
+R-lubridate
+R-magrittr
+R-manipulate
+R-mapproj
+R-maps
+R-maptools
+R-markdown
+R-memoise
+R-microbenchmark
+R-mime
+R-minqa
+R-mockery
+R-mondate
+R-multcomp
+R-munsell
+R-mvtnorm
+R-neuralnet
+R-nloptr
+R-openssl
+R-pbdZMQ
+R-pbkrtest
+R-pillar
+R-pkgconfig
+R-plyr
+R-png
+R-praise
+R-proto
+R-pryr
+R-quadprog
+R-quantmod
+R-quantreg
+R-randomForest
+R-repr
+R-reshape2
+R-rlang
+R-rmarkdown
+R-roxygen2
+R-rprojroot
+R-rstudioapi
+R-rversions
+R-sandwich
+R-scales
+R-shiny
+R-sourcetools
+R-sp
+R-statmod
+R-stringi
+R-stringr
+R-tau
+R-testit
+R-testthat
+R-tibble
+R-timeDate
+R-tis
+R-tree
+R-tseries
+R-uuid
+R-viridisLite
+R-whisker
+R-withr
+R-xml2
+R-xtable
+R-xts
+R-yaml
+R-zoo
+SDL
+SDL2
+SDL2_gfx
+SDL2_image
+SDL2_mixer
+SDL2_net
+SDL2_ttf
+SDL_gfx
+SDL_image
+SDL_mixer
+SDL_net
+SDL_ttf
+SQLAlchemy
+SocksiPy-branch
+Sphinx
+SuiteSparse
+Tempita
+Theano
+Thunar
+Vertex-theme
+WALinuxAgent
+WSGIProxy2
+WebOb
+WebTest
+Werkzeug
+Whoosh
 abireport
 accountsservice
 acl
@@ -25,6 +202,7 @@ arc-theme
 argcomplete
 argparse
 asciidoc
+asio
 asn1crypto
 aspell
 aspell-en
@@ -48,15 +226,14 @@ autogen
 automake
 awscli
 azure-configs
-Babel
 babl
 backports.functools_lru_cache
 backports.ssl_match_hostname
 backports.weakref
 bash
 bash-completion
-bashdb
 bash_kernel
+bashdb
 bats
 bazel
 bc
@@ -85,6 +262,7 @@ bundle-chroot-builder
 bz2file
 bzip2
 c-ares
+c_rehash
 ca-certs
 ca-certs-static
 cabextract
@@ -92,6 +270,7 @@ cairo
 cairomm
 cargo
 caribou
+catch2
 catkin
 catkin_pkg
 ccache
@@ -101,10 +280,10 @@ certbot
 certifi
 cffi
 cgdb
+cgit
 chardet
 check
 cheese
-Cheetah
 chrome-gnome-shell
 chrpath
 cifs-utils
@@ -118,15 +297,17 @@ clear-font
 click
 clinfo
 cloudpickle
+clr-R-helpers
 clr-boot-manager
 clr-debug-info
 clr-desktop-defaults
 clr-hardware-files
+clr-init
 clr-man-pages
 clr-power-tweaks
 clr-python-timestamp
-clr-R-helpers
 clr-rpm-config
+clr-service-restart
 clr-systemd-config
 clr-update-triggers
 clr-wallpapers
@@ -145,6 +326,7 @@ colorama
 colord
 colord-gtk
 comedilib
+compat-SDL2-soname1
 compat-efivar-soname0
 compat-fuse-soname2
 compat-gc-soname1
@@ -158,11 +340,9 @@ compat-mpfr-soname4
 compat-opencv-soname32
 compat-opencv-soname33
 compat-readline
-compat-SDL2-soname1
 component
 compositeproto
 compute-image-packages
-ConfigArgParse
 configobj
 configparser
 connect-proxy
@@ -189,15 +369,12 @@ cryptsetup
 cscope
 cssselect
 ctags
-CUnit
 cups
 cups-filters
 cups-pk-helper
 curl
 cve-check-tool
 cycler
-Cython
-c_rehash
 damageproto
 dapl
 darktable
@@ -298,7 +475,6 @@ fontconfig
 fontsproto
 freeglut
 freeipmi
-FreeRDP
 freetype
 fribidi
 fs
@@ -311,14 +487,15 @@ gawk
 gc
 gcab
 gcc
-GConf
 gcr
 gcs-oauth2-boto-plugin
+gdal
 gdb
 gdbm
 gdk-pixbuf
 gdm
 geany
+geany-plugins
 gedit
 gegl
 gensim
@@ -445,6 +622,7 @@ hunspell
 hwloc
 hyperstart
 hypothesis
+i2c-tools
 ibus
 icalendar
 icdiff
@@ -491,7 +669,6 @@ javapackages-tools
 jedi
 jedi-vim
 jemalloc
-Jinja2
 jmespath
 joe
 jq
@@ -508,7 +685,6 @@ jupyter_core
 kafka-dep
 kbd
 kbproto
-Keras
 kexec-tools
 keyring
 keyutils
@@ -524,6 +700,34 @@ lcov
 lensfun
 less
 leveldb
+libICE
+libSM
+libX11
+libXScrnSaver
+libXau
+libXcomposite
+libXcursor
+libXdamage
+libXdmcp
+libXext
+libXfixes
+libXfont
+libXfont2
+libXft
+libXi
+libXinerama
+libXmu
+libXpm
+libXpresent
+libXrandr
+libXrender
+libXres
+libXt
+libXtst
+libXv
+libXvMC
+libXxf86dga
+libXxf86vm
 libaio
 libarchive
 libarchive-c
@@ -571,7 +775,6 @@ libgudev
 libgusb
 libgweather
 libical
-libICE
 libidn
 libinput
 libiscsi
@@ -609,7 +812,6 @@ libsamplerate
 libseccomp
 libsecret
 libsigc++
-libSM
 libsndfile
 libsolv
 libsoup
@@ -633,48 +835,21 @@ libva-utils
 libvirt
 libvirt-glib
 libvirt-python
-LibVNCServer
 libvorbis
 libvpx
 libwacom
 libwebp
 libwnck
 libwnck3
-libX11
-libXau
 libxcb
-libXcomposite
-libXcursor
-libXdamage
-libXdmcp
-libXext
 libxfce4ui
 libxfce4util
-libXfixes
-libXfont
-libXfont2
-libXft
-libXi
-libXinerama
 libxkbcommon
 libxkbfile
 libxklavier
 libxml2
-libXmu
-libXpm
-libXpresent
-libXrandr
-libXrender
-libXres
-libXScrnSaver
 libxshmfence
 libxslt
-libXt
-libXtst
-libXv
-libXvMC
-libXxf86dga
-libXxf86vm
 libzip
 linecache2
 links
@@ -689,7 +864,6 @@ linux-hyperv-mini
 linux-kvm
 linux-libc-headers
 linux-lts
-Linux-PAM
 linux-steam-integration
 linux-tools
 llvm
@@ -700,24 +874,18 @@ logutils
 lsacpi
 lshw
 lsof
-LS_COLORS
 ltp
 ltrace
 lua
-LuaJIT
-LVM2
 lxml
 lz4
 lzip
 lzo
 m4
 make
-Mako
 man-db
 man-pages
 mariadb
-Markdown
-MarkupSafe
 mash
 matplotlib
 maven-dep
@@ -741,10 +909,8 @@ mixer-tools
 mkfontdir
 mkfontscale
 mock
-ModemManager
 mod_wsgi
 moka-icon-theme
-MonkeyType
 mosh
 motd-update
 motif
@@ -763,7 +929,6 @@ musl
 mutt
 mutter
 mypy
-MySQL-python
 nagios-plugins
 nano
 nasm
@@ -783,8 +948,6 @@ netcat
 netifaces
 nettle
 network-manager-applet
-NetworkManager
-NetworkManager-openconnect
 networkx
 newt
 nfs-utils
@@ -833,7 +996,6 @@ openjdk
 openldap
 openmpi
 opensm
-OpenSP
 openssh
 openssl
 openvpn
@@ -848,17 +1010,17 @@ p7zip
 packaging
 pacrunner
 pandas
+pandoc
 pandocfilters
 pango
 pangomm
 parallel
+parameter-framework
 paramiko
 parsedatetime
 parso
 parted
 passlib
-Paste
-PasteDeploy
 patch
 patchutils
 pavucontrol
@@ -872,15 +1034,15 @@ pep8
 perftest
 perl
 perl-B-Hooks-EndOfScope
+perl-CPAN-Meta-Check
 perl-Capture-Tiny
 perl-Class-Data-Inheritable
 perl-Class-Singleton
-perl-CPAN-Meta-Check
 perl-Crypt-SSLeay
+perl-DBI
 perl-DateTime
 perl-DateTime-Locale
 perl-DateTime-TimeZone
-perl-DBI
 perl-Devel-Confess
 perl-Devel-StackTrace
 perl-Digest-CRC
@@ -899,21 +1061,21 @@ perl-HTTP-Daemon
 perl-HTTP-Date
 perl-HTTP-Message
 perl-HTTP-Negotiate
-perl-Importer
 perl-IO-HTML
 perl-IO-Interactive-Tiny
 perl-IO-Socket-SSL
 perl-IO-stringy
 perl-IPC-Run
-perl-libwww-perl
+perl-Importer
+perl-LWP-MediaTypes
+perl-LWP-Protocol-https
 perl-List-AllUtils
 perl-List-SomeUtils
 perl-List-SomeUtils-XS
 perl-List-UtilsBy
-perl-LWP-MediaTypes
-perl-LWP-Protocol-https
-perl-Math-BigInt-GMP
 perl-MIME-Base64
+perl-MRO-Compat
+perl-Math-BigInt-GMP
 perl-Module-Build
 perl-Module-Implementation
 perl-Module-Install
@@ -921,9 +1083,6 @@ perl-Module-Pluggable
 perl-Module-Runtime
 perl-Module-ScanDeps
 perl-Mozilla-CA
-perl-MRO-Compat
-perl-namespace-autoclean
-perl-namespace-clean
 perl-Net-HTTP
 perl-Net-SSLeay
 perl-Package-Stash
@@ -964,6 +1123,9 @@ perl-XML-SAX-Base
 perl-XML-SAX-Expat
 perl-XML-Simple
 perl-YAML-Tiny
+perl-libwww-perl
+perl-namespace-autoclean
+perl-namespace-clean
 persistent
 pesign
 pexpect
@@ -973,7 +1135,6 @@ pickleshare
 pidgin
 pidgin-sipe
 pigz
-Pillow
 pinentry
 pip
 pixman
@@ -1008,6 +1169,7 @@ pugixml
 pulseaudio
 py
 py2cairo
+pyOpenSSL
 pyaml
 pyasn1
 pyasn1-modules
@@ -1016,18 +1178,16 @@ pycparser
 pycrypto
 pycurl
 pydot
-pydotplus
 pydot_ng
+pydotplus
 pyflakes
-Pygments
 pygobject
 pyliblzma
 pylint
 pynacl
-pyOpenSSL
+pypandoc
 pyparsing
 pypy
-PyQt5
 pyquery
 pyrfc3339
 pyserial
@@ -1037,13 +1197,13 @@ pytest-runner
 pytest-timeout
 pytest-xdist
 python
+python-Levenshtein
 python-augeas
 python-dateutil
 python-future
 python-gflags
 python-keyczar
 python-krbV
-python-Levenshtein
 python-magic
 python-memcached
 python-mimeparse
@@ -1060,133 +1220,16 @@ python-urwid
 python3
 pytz
 pyudev
-PyWavelets
 pywbem
 pyxdg
-PyYAML
 pyzmq
 qemu
 qemu-lite
 qpdf
 qt-everywhere-opensource-src
-QtAwesome
 qtconsole
-QtPy
 quagga
 quilt
-R
-R-assertthat
-R-backports
-R-BH
-R-bitops
-R-brew
-R-Cairo
-R-car
-R-chron
-R-colorspace
-R-commonmark
-R-crayon
-R-curl
-R-DBI
-R-deepnet
-R-desc
-R-devtools
-R-dichromat
-R-digest
-R-dynlm
-R-e1071
-R-evaluate
-R-foreach
-R-formatR
-R-ggplot2
-R-git2r
-R-glmnet
-R-gtable
-R-gtools
-R-highr
-R-hms
-R-httpuv
-R-httr
-R-IRdisplay
-R-IRkernel
-R-iterators
-R-jsonlite
-R-knitr
-R-labeling
-R-lazyeval
-R-lme4
-R-lmtest
-R-lubridate
-R-magrittr
-R-manipulate
-R-mapproj
-R-maps
-R-maptools
-R-markdown
-R-MatrixModels
-R-memoise
-R-microbenchmark
-R-mime
-R-minqa
-R-mockery
-R-mondate
-R-multcomp
-R-munsell
-R-mvtnorm
-R-neuralnet
-R-nloptr
-R-openssl
-R-pbdZMQ
-R-pbkrtest
-R-pillar
-R-pkgconfig
-R-plyr
-R-png
-R-praise
-R-proto
-R-pryr
-R-quadprog
-R-quantmod
-R-quantreg
-R-R6
-R-randomForest
-R-RColorBrewer
-R-Rcpp
-R-RcppEigen
-R-RCurl
-R-repr
-R-reshape2
-R-rlang
-R-roxygen2
-R-rprojroot
-R-rstudioapi
-R-rversions
-R-sandwich
-R-scales
-R-sp
-R-SparseM
-R-statmod
-R-stringi
-R-stringr
-R-tau
-R-testit
-R-testthat
-R-TH.data
-R-tibble
-R-timeDate
-R-tis
-R-tree
-R-tseries
-R-TTR
-R-uuid
-R-viridisLite
-R-whisker
-R-withr
-R-XML
-R-xml2
-R-xts
-R-yaml
-R-zoo
 randrproto
 rdma-core
 re2c
@@ -1209,6 +1252,7 @@ rsa
 rsync
 ruby
 runc
+rust-std32
 rustc
 rxvt-unicode
 s2tc
@@ -1227,18 +1271,6 @@ scons
 screen
 scripttest
 scrnsaverproto
-SDL
-SDL2
-SDL2_gfx
-SDL2_image
-SDL2_mixer
-SDL2_net
-SDL2_ttf
-SDL_gfx
-SDL_image
-SDL_mixer
-SDL_net
-SDL_ttf
 seaborn
 secretstorage
 sed
@@ -1256,12 +1288,11 @@ simplejson
 sip
 six
 slang
-smartmontools
 smart_open
+smartmontools
 snappy
 snowballstemmer
 socat
-SocksiPy-branch
 sos
 soundmodem
 source-code-pro
@@ -1270,15 +1301,14 @@ sox
 spark-dep
 speex
 speexdsp
-Sphinx
 sphinxcontrib-newsfeed
 sphinxcontrib-websupport
+spi-tools
 spice
 spice-gtk
 spice-protocol
 spyder
 spyder-notebook
-SQLAlchemy
 sqlite-autoconf
 sqlparse
 sshfs
@@ -1288,7 +1318,6 @@ stow
 strace
 subunit
 sudo
-SuiteSparse
 sure
 swig
 swupd-client
@@ -1310,7 +1339,6 @@ tcpdump
 telemetrics-client
 telepathy-glib
 telepathy-logger
-Tempita
 tensorboard
 tensorflow
 termcolor
@@ -1323,10 +1351,8 @@ testscenarios
 testtools
 texinfo
 tflearn
-Theano
 thermal_daemon
 thin-provisioning-tools
-Thunar
 thunar-volman
 thunderbird
 thunderbolt-software-user-space
@@ -1362,6 +1388,7 @@ upower
 uritemplate
 urlgrabber
 urllib3
+usbredir
 usbutils
 usermode
 userspace-rcu
@@ -1372,7 +1399,6 @@ uwsgi
 v4l-utils
 valgrind
 vcversioner
-Vertex-theme
 videoproto
 vim
 vim-go
@@ -1382,31 +1408,26 @@ virt-viewer
 virtualenv
 vlc
 volume_key
+vsqlite
 vte
 vulkan-sdk
 waitress
-WALinuxAgent
 wayland
 wayland-protocols
 wcwidth
 webcolors
 webencodings
 webkitgtk
-WebOb
 websocket_client
 websockify
-WebTest
-Werkzeug
 weston
 wget
 wheel
 which
-Whoosh
 widgetsnbextension
 wol
 wpa_supplicant
 wrapt
-WSGIProxy2
 x11perf
 x11vnc
 xapian-core
@@ -1475,6 +1496,7 @@ xz
 yajl
 yaml
 yasm
+yelp
 yelp-tools
 yelp-xsl
 yum