Have vendor.py also update the options.conf file

This file is used for spec and upstream content so updating it is
important for improving the build automation.

Signed-off-by: William Douglas <william.douglas@intel.com>

Makefile.common

@@ -391,6 +391,17 @@ koji-waitrepo: kojidef
 		koji wait-repo --build=${SRPMVERS} ${WAIT_OPTS} ${KOJI_TAG}-build; \
 	fi
 
+.PHONY: koji-tag
+#help koji-tag: runs koji tag-pkg on what's in the current specfile's nvr
+koji-tag:
+	koji tag-pkg dist-clear $(SRPMVERS)
+
+.PHONY: koji-untag
+#help koji-untag: runs koji untag-pkg on what's in the current specfile's nvr
+koji-untag:
+	koji untag-pkg dist-clear $(SRPMVERS)
+
+
 update-versions:
 
 .PHONY: update

packages

@@ -10,6 +10,7 @@ DML
 Endeavour
 F-Engrave
 FreeRDP
+FreeRDP2
 GConf
 Gradio
 ImageMagick
@@ -42,6 +43,7 @@ OpenSP
 PDAL
 PyMySQL
 PyQt5
+PyQt6
 PySocks
 PyYAML
 QAT-ZSTD-Plugin
@@ -1045,6 +1047,7 @@ SuiteSparse
 TLP
 Thunar
 UCD
+UxPlay
 VTK
 Vc
 Vulkan-Headers
@@ -1098,8 +1101,8 @@ ark
 armadillo
 arp-scan
 arpack-ng
-artikulate
 asciidoc
+asciidoctor
 asciinema
 asio
 aspell
@@ -1215,7 +1218,6 @@ calendarsupport
 can-utils
 cantarell-fonts
 cantata
-cantor
 capnproto
 capslock
 capstone
@@ -1292,8 +1294,10 @@ collectl
 colm
 colord
 colord-gtk
+colord-kde
 colordiff
 columbiad
+compat-Botan-soname2
 compat-atkmm-soname16
 compat-babeltrace-one
 compat-cairomm-soname10
@@ -1308,18 +1312,23 @@ compat-gnome-bluetooth-soname-13
 compat-gtksourceview-soname3
 compat-json-c-soname4
 compat-libffi-soname6
+compat-libffi-soname7
 compat-libpng-soname12
 compat-libsigc++-soname20
 compat-libsoup-soname-24
 compat-libva-soname1
 compat-libvpx-soname7
+compat-libvpx-soname8
 compat-pangomm-soname14
 compat-protobuf-soname29
 compat-re2-soname10
 compat-readline-soname5
+compat-taglib-soname1
 compat-tbb-soname2
 compat-tiff-soname5
+compat-wlroots-soname11
 component
+compose
 configobj
 confuse
 conky
@@ -1386,6 +1395,7 @@ directx-headers
 direwolf
 dist-pam-configs
 dkms
+dlib
 dlt-daemon
 dmap2gcode
 dmenu
@@ -1417,13 +1427,13 @@ dragonbox
 drkonqi
 dropwatch
 dssi
-dstat
 dtc
 duktape
 dunst
 duperemove
 dvisvgm
 dwarves
+dymo-cups-drivers
 dyskctl
 e2fsprogs
 earlyoom
@@ -1450,6 +1460,7 @@ eog
 eog-plugins
 epm
 epson-inkjet-printer-escpr
+epsonscan2
 ethtool
 etr
 eventviews
@@ -1459,7 +1470,7 @@ evolution-data-server
 evolution-ews
 evtest
 exempi
-exfat-utils
+exfatprogs
 exiv2
 exo
 expat
@@ -1473,9 +1484,11 @@ fann
 farstream
 faultstat
 fcgi
+fdk-aac
 fdupes
 feh
 fetchmail
+ffmpegthumbs
 fftw
 file
 file-roller
@@ -1489,6 +1502,7 @@ fish
 flac
 flare-engine
 flare-game
+flatpack-kcm
 flatpak
 flatpak-builder
 fldigi
@@ -1530,6 +1544,7 @@ gc
 gcab
 gcc
 gcc11
+gcc14
 gcc7
 gcc8
 gcc9
@@ -1566,6 +1581,7 @@ gimp
 girara
 git
 git-gui
+git-lfs
 gitg
 gitolite
 gjs
@@ -1693,6 +1709,7 @@ gtk3
 gtk4
 gtkmm2
 gtkmm3
+gtkmm4
 gtksourceview
 gtksourceview4
 gtkspell3
@@ -1701,7 +1718,6 @@ guile
 gutenprint
 gvfs
 gvim
-gwenview
 gzip
 hamlib
 haproxy
@@ -1718,6 +1734,7 @@ hexedit
 hicolor-icon-theme
 hiredis-c
 hostname
+howdy
 hplip
 htop
 htslib
@@ -1761,6 +1778,7 @@ inkscape
 innoextract
 inotify-tools
 input-leap
+input-remapper
 intel-cmt-cat
 intel-gmmlib
 intel-hybrid-driver
@@ -1811,10 +1829,9 @@ json-glib
 jsoncpp
 juk
 kaccounts-integration
-kactivities
-kactivities-stats
 kactivitymanagerd
 kalarm
+kalgebra
 kamera
 kanagram
 kapidox
@@ -1828,7 +1845,6 @@ kbackup
 kbd
 kblackbox
 kblocks
-kblog
 kbookmarks
 kbounce
 kbreakout
@@ -1842,6 +1858,7 @@ kcmutils
 kcodecs
 kcolorchooser
 kcolorpicker
+kcolorscheme
 kcompletion
 kconfig
 kconfigwidgets
@@ -1863,27 +1880,24 @@ kded
 kdeedu-data
 kdegraphics-mobipocket
 kdegraphics-thumbnailers
-kdelibs4support
 kdenetwork-filesharing
 kdenlive
 kdepim-runtime
 kdeplasma-addons
-kdesdk-kioslaves
+kdesdk-kio
 kdesdk-thumbnailers
-kdesignerplugin
 kdesu
 kdf
 kdiagram
 kdialog
 kdiamond
-kdiff3
 kdnssd
 kdoctools
 kdsoap
+kdsoap-ws-discovery-client
 keditbookmarks
 keepalived
 keepassxc
-kemoticons
 kernel-config
 kernel-install
 kexec-tools
@@ -1891,24 +1905,24 @@ keychain
 keyutils
 kfilemetadata
 kfind
-kfloppy
 kfourinline
-kgamma5
+kgamma
 kgeography
 kget
 kglobalaccel
+kglobalacceld
 kgoldrunner
+kgpg
 kguiaddons
 khangman
 khelpcenter
 kholidays
-khotkeys
-khtml
 ki18n
+kicad
+kicad-packages3D
 kiconthemes
 kidentitymanagement
 kidletime
-kig
 kigo
 killbots
 kimageannotator
@@ -1916,19 +1930,21 @@ kimageformats
 kimagemapeditor
 kimap
 kinfocenter
-kinit
 kio
 kio-admin
 kio-extras
+kio-zeroconf
+kirigami
 kirigami-addons
+kirigami-gallery
 kirigami2
+kiriki
 kitemmodels
 kitemviews
 kiten
 kitinerary
 kjobwidgets
 kjs
-kjsembed
 kjumpingcube
 kldap
 kleopatra
@@ -1941,7 +1957,6 @@ kmail
 kmail-account-wizard
 kmailtransport
 kmbox
-kmediaplayer
 kmenuedit
 kmime
 kmines
@@ -1953,6 +1968,7 @@ knack
 knavalbattle
 knetwalk
 knewstuff
+knights
 knotes
 knotifications
 knotifyconfig
@@ -1960,6 +1976,7 @@ koji
 kolf
 kollision
 kolourpaint
+kompare
 konqueror
 konquest
 konsole
@@ -1980,10 +1997,8 @@ krb5
 krdc
 kreversi
 kronosnet
-kross
 kruler
 krunner
-krusader
 ksanecore
 kscreen
 kscreenlocker
@@ -1996,18 +2011,18 @@ ksnakeduel
 kspaceduel
 ksquares
 ksshaskpass
-kstars
+kstatusnotifieritem
 ksudoku
-ksysguard
+ksvg
 ksystemlog
 ksystemstats
 kteatime
 ktextaddons
 ktexteditor
+ktexttemplate
 ktextwidgets
 ktimer
 ktnef
-ktp-desktop-applets
 ktuberling
 kturtle
 kubernetes
@@ -2018,7 +2033,6 @@ kwallet
 kwallet-pam
 kwalletmanager
 kwayland
-kwayland-integration
 kwayland-server
 kwidgetsaddons
 kwin
@@ -2026,11 +2040,9 @@ kwindowsystem
 kwordquiz
 kwrited
 kxmlgui
-kxmlrpcclient
 kyotocabinet
 ladspa_sdk
 latencytop
-latte-dock
 layer-shell-qt
 lcms2
 lcov
@@ -2077,6 +2089,7 @@ libatomic_ops
 libavif
 libavtp
 libb64
+libbacktrace
 libblockdev
 libbpf
 libbsd
@@ -2181,7 +2194,6 @@ libkdepim
 libkeduvocdocument
 libkexiv2
 libkgapi
-libkipi
 libkleo
 libkmahjongg
 libkomparediff2
@@ -2204,6 +2216,7 @@ libmodplug
 libmodulemd
 libmpack
 libmpack-lua
+libmsgraph
 libmspack
 libmspub
 libmtp
@@ -2240,12 +2253,15 @@ libpeas
 libpinyin
 libpipeline
 libplacebo
+libplasma
+libplist
 libpng
 libportal
 libproxy
 libpsl
 libpthread-stubs
 libpwquality
+libqaccessibilityclient
 libqalculate
 libqb
 libqmi
@@ -2280,6 +2296,7 @@ libspatialite
 libspectre
 libspiro
 libspnav
+libspng
 libsrtp
 libssh
 libssh2
@@ -2326,6 +2343,7 @@ libwpd
 libwpe
 libwpg
 libwps
+libxcrypt
 libxcvt
 libxdg-basedir
 libxfce4ui
@@ -2372,7 +2390,6 @@ lm-sensors
 lmdb
 logrotate
 logutils
-lokalize
 lpeg
 lsacpi
 lshw
@@ -2428,7 +2445,6 @@ meson
 messagelib
 meta-c-basic
 meta-desktop-gnome
-meta-desktop-kde
 meta-os-core
 meta-os-core-plus
 metacity
@@ -2441,6 +2457,7 @@ micro-config-drive-aws
 micro-config-drive-equinix
 micro-config-drive-oci
 milou
+mimetreeparser
 minetest
 minetest_game
 mingw-binutils
@@ -2518,6 +2535,7 @@ net-tools
 netaddr
 netbase
 netcdf
+netcdf-fortran
 netdata
 nethogs
 netplan
@@ -2575,8 +2593,8 @@ ocamlbuild
 ocl-icd
 octave
 oiio
-okteta
 okular
+oneDPL
 oneVPL
 onig
 opa-fm
@@ -2588,6 +2606,7 @@ open-vm-tools
 openal-soft
 openblas
 openbox
+opencl-clang
 opencl-headers
 openconnect
 openct
@@ -2617,7 +2636,7 @@ osm-gps-map
 ostree
 otp
 oxygen
-oxygen-icons5
+oxygen-icons
 oxygen-sounds
 p11-kit
 p7zip
@@ -2626,6 +2645,7 @@ pagemon
 paho.mqtt.c
 paho.mqtt.cpp
 palapeli
+pam-python
 pam_wrapper
 pandas
 pandoc
@@ -3223,6 +3243,7 @@ perl-Plack
 perl-Pod-Constants
 perl-Pod-Coverage
 perl-Pod-LaTeX
+perl-Pod-Markdown
 perl-Pod-POM
 perl-Pod-Parser
 perl-Pod-Plainer
@@ -3338,6 +3359,7 @@ perl-Test-File-ShareDir-Dist
 perl-Test-Fork
 perl-Test-Future-IO-Impl
 perl-Test-Identity
+perl-Test-InDistDir
 perl-Test-Inter
 perl-Test-LWP-UserAgent
 perl-Test-LeakTrace
@@ -3406,6 +3428,8 @@ perl-Text-Trim
 perl-Text-Unidecode
 perl-Text-WrapI18N
 perl-Text-Wrapper
+perl-Throwable
+perl-Throwable-SugarFactory
 perl-Tie-Cycle
 perl-Tie-IxHash
 perl-Tie-Simple
@@ -3566,18 +3590,23 @@ pipewire
 pixman
 pkcs11-helper
 pkg-config
+plasma-activities
+plasma-activities-stats
 plasma-browser-integration
 plasma-desktop
 plasma-discover
-plasma-framework
+plasma-disks
+plasma-firewall
 plasma-integration
 plasma-nm
 plasma-pa
 plasma-systemmonitor
 plasma-vault
 plasma-wayland-protocols
+plasma-welcome
 plasma-workspace
 plasma-workspace-wallpapers
+plasma5support
 plzip
 pm-graph
 pmdk
@@ -3589,6 +3618,7 @@ podman
 polkit
 polkit-kde-agent
 polkit-qt
+polkit-qt6
 poppler
 poppler-data-clr-rename
 popt
@@ -3622,7 +3652,9 @@ psstop
 pth
 pugixml
 pulseaudio
+pulseaudio-qt
 purpose
+puzzles
 pv
 pwgen
 pyatspi
@@ -3749,6 +3781,7 @@ pypi-certifi
 pypi-cffi
 pypi-cffsubr
 pypi-cfgv
+pypi-chai
 pypi-chaospy
 pypi-chardet
 pypi-charset_normalizer
@@ -3806,6 +3839,7 @@ pypi-cython
 pypi-cytoolz
 pypi-dacite
 pypi-dask
+pypi-dateparser
 pypi-datetime
 pypi-debugpy
 pypi-decorator
@@ -3837,12 +3871,13 @@ pypi-dnacentersdk
 pypi-dns_lexicon
 pypi-dnspython
 pypi-docker
-pypi-docker_compose
 pypi-docker_pycreds
 pypi-docopt
 pypi-docstring_parser
 pypi-docstring_to_markdown
 pypi-docutils
+pypi-doxypypy
+pypi-doxyqml
 pypi-dpcontracts
 pypi-dulwich
 pypi-ecdsa
@@ -3943,6 +3978,7 @@ pypi-hatch_requirements_txt
 pypi-hatch_vcs
 pypi-hatchling
 pypi-heapdict
+pypi-hishel
 pypi-hjson
 pypi-hkp4py
 pypi-home_assistant_frontend
@@ -4141,6 +4177,7 @@ pypi-nocasedict
 pypi-nocaselist
 pypi-nodeenv
 pypi-notebook_shim
+pypi-numexpr
 pypi-numpoly
 pypi-numpy
 pypi-numpydoc
@@ -4178,6 +4215,7 @@ pypi-pathlib2
 pypi-pathspec
 pypi-patsy
 pypi-pbr
+pypi-pbs_installer
 pypi-pdfminer.six
 pypi-pdm
 pypi-pdm_backend
@@ -4260,6 +4298,7 @@ pypi-pycups
 pypi-pycurl
 pypi-pydantic
 pypi-pydantic_core
+pypi-pydbus
 pypi-pydispatcher
 pypi-pydocstyle
 pypi-pydot
@@ -4268,6 +4307,7 @@ pypi-pyelftools
 pypi-pyfakefs
 pypi-pyflakes
 pypi-pygame
+pypi-pygdbmi
 pypi-pygithub
 pypi-pygments
 pypi-pyicu
@@ -4440,6 +4480,7 @@ pypi-setuptools_scm
 pypi-sh
 pypi-shapely
 pypi-shellingham
+pypi-shelved_cache
 pypi-simplegeneric
 pypi-six
 pypi-slugify
@@ -4493,6 +4534,7 @@ pypi-sqlalchemy
 pypi-sqlparse
 pypi-sshtunnel
 pypi-stack_data
+pypi-starlette
 pypi-storops
 pypi-strictyaml
 pypi-subprocess_tee
@@ -4518,6 +4560,7 @@ pypi-three_merge
 pypi-tifffile
 pypi-tinycss2
 pypi-tldextract
+pypi-tokenizers
 pypi-toml
 pypi-tomli
 pypi-tomli_w
@@ -4530,6 +4573,7 @@ pypi-tox
 pypi-tqdm
 pypi-traitlets
 pypi-trampolim
+pypi-transformers
 pypi-translationstring
 pypi-trimesh
 pypi-trio
@@ -4583,6 +4627,7 @@ pypi-urlobject
 pypi-urwid
 pypi-user_agents
 pypi-userpath
+pypi-uvicorn
 pypi-uvloop
 pypi-venusian
 pypi-verboselogs
@@ -4692,6 +4737,7 @@ qbittorrent
 qca
 qca-qt5
 qcoro
+qcoro6
 qemu
 qemu-guest-additions
 qgit
@@ -4809,7 +4855,6 @@ rlwrap
 rng-tools
 robin-map
 roboto
-rocs
 rofi
 rpcbind
 rpcsvc-proto
@@ -4854,6 +4899,7 @@ serf
 setserial
 setxkbmap
 sg3_utils
+shaderc
 shadow
 shapelib
 shared-mime-info
@@ -5019,10 +5065,8 @@ usb-modeswitch
 usb-modeswitch-data
 usbredir
 usbutils
-user-manager
 userspace-rcu
 usrbinjava
-usrbinpython
 usrbinvi
 utf8proc
 utfcpp
@@ -5186,7 +5230,6 @@ zabbix
 zathura
 zathura-pdf-poppler
 zenity
-zeroconf-ioslave
 zimg
 zip
 zlib
@@ -5195,4 +5238,5 @@ zopfli
 zsh
 zstd
 zstd-bin
+zxcvbn-c
 zxing

vendor.py

@@ -92,6 +92,7 @@ def update_cargo_vendor(path, name, git):
 
 def update_cargo_sources(name, tag):
     makefile = []
+    options = []
     archive_match = os.path.join('$(CGIT_BASE_URL)', 'vendor', name,
                                  'snapshot', name)
     with open('Makefile', encoding='utf8') as mfile:
@@ -108,6 +109,20 @@ def update_cargo_sources(name, tag):
     with open('Makefile', 'w', encoding='utf8') as mfile:
         mfile.writelines(makefile)
 
+    with open('options.conf', encoding='utf8') as ofile:
+        for line in ofile.readlines():
+            if line.startswith('archives'):
+                if re.match(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz', line):
+                    new_archives = re.sub(archive_match + r'[a-zA-Z0-9_\-.]+\.tar\.xz',
+                                          f"{archive_match}-{tag}.tar.xz\n", line)
+                else:
+                    new_archives = f"achives = {archive_match}-{tag}.tar.xz ./vendor\n"
+                options.append(new_archives)
+            else:
+                options.append(line)
+    with open('options.conf', 'w', encoding='utf8') as ofile:
+        ofile.writelines(options)
+
 
 def main():
     vtype = vendor_check()