update packages file

We support tag names like
${package}-${version}
${package}-v${version}
${version}
v${version}

Now add support for things like
${package}-foo-bar-${version}
foo-bar-${version}

for example:
vulkan-sdk-1.3.275.0 for SPIRV-Headers

Makefile.common

@@ -582,6 +582,78 @@ cloc: $(SRPMFILE)
 	@$(MOCK) --clean --scrub=chroot --uniqueext=$(PKG_NAME)
 	cat results/cloc.txt
 
+#help catchup: Backport the commits from the current version to the upstream HEAD (not release).
+#help Only works if giturl is defined and the current package version can be mapped to a git tag.
+catchup:
+	$(MAKE) catchup-HEAD
+
+#help catchup-<commit|tag>: Backport the commits from the current version to the specified commit or tag.
+#help Only works if giturl is defined and the current package version can be mapped to a git tag.
+catchup-%:
+	@target=$*; \
+	giturl=$$(grep -E '^giturl\s*=\s*\S+' options.conf | sed 's/giturl\s*=\s*//' 2>/dev/null); \
+	if [[ -z "$${giturl}" ]]; then \
+		echo "Error: giturl not defined in options.conf"; \
+		exit 1; \
+	fi; \
+	mkdir -p results; \
+	if [[ -d results/$(PKG_NAME) ]]; then \
+		echo "Reusing existing repository..."; \
+		git -C results/$(PKG_NAME) fetch origin; \
+	else \
+		echo "Cloning upstream repository..."; \
+		git -C results clone "$${giturl}" $(PKG_NAME); \
+	fi; \
+	if ! git -C results/$(PKG_NAME) rev-parse --verify --quiet "$${target}" >/dev/null; then \
+		echo "Error: Target commit/tag $${target} not found"; \
+		exit 1; \
+	fi; \
+	version=$$(rpm -q --qf '%{VERSION}\n' --specfile $(SPECFILE) | head -1); \
+	echo "Version: $${version}"; \
+	current_tag=$$(git -C results/$(PKG_NAME) tag --list | grep -E "^($(PKG_NAME)-)?(.+-|v)?$${version}$$") || { \
+		echo "Error: No tag found for current package version"; \
+		exit 1; \
+	}; \
+	echo "Catching up from $${current_tag} to $${target}"; \
+	for commit in $$(git -C results/$(PKG_NAME) log --reverse --pretty=oneline $${current_tag}..$${target} | cut -d' ' -f1); do \
+		$(MAKE) backport-$${commit}; \
+	done;
+
+
+#help backport-<commit>: Retrieve a commit from the upstream git repository and save it as a backport patch.
+#help The giturl is read from options.conf.
+backport-%:
+	@commit=$*; \
+	echo "Backporting commit: $${commit}"; \
+	giturl=$$(grep -E '^giturl\s*=\s*\S+' options.conf | sed 's/giturl\s*=\s*//' 2>/dev/null); \
+	if [[ -z "$${giturl}" ]]; then \
+		echo "Error: giturl not defined in options.conf"; \
+		exit 1; \
+	fi; \
+	mkdir -p results; \
+	if [[ -d results/$(PKG_NAME) ]]; then \
+		echo "Reusing existing repository..."; \
+		git -C results/$(PKG_NAME) fetch origin; \
+	else \
+		echo "Cloning upstream repository..."; \
+		git -C results clone "$${giturl}" $(PKG_NAME); \
+	fi; \
+	full_commit=$$(git -C results/$(PKG_NAME) show --pretty=oneline $${commit} 2>/dev/null | head -1 | cut -d' ' -f 1); \
+	if [[ -z "$${full_commit}" ]]; then \
+		echo "Error: Commit for $${commit} not found"; \
+		exit 1; \
+	fi; \
+	patch=backport-$${full_commit}.patch; \
+	git -C results/$(PKG_NAME) format-patch -1 --stdout $${full_commit} > $${patch}; \
+	if [[ -s $${patch} ]]; then \
+		echo "$${patch} created"; \
+		grep -qE "^$${patch}$$" series 2>/dev/null || echo "$${patch}" >> series; \
+	else \
+		rm -f $${patch}; \
+		echo "Error: Failed to create backport patch"; \
+		exit 1; \
+	fi \
+
 .PHONY: whatrequires
 #help whatrequires: Output a list of packages that directly depend on this one,
 #help showing the subpackage-level breakdown. Each line of output has the format

packages

@@ -9,6 +9,7 @@ CopyQ
 DML
 Endeavour
 F-Engrave
+FreeCAD
 FreeRDP
 FreeRDP2
 GConf
@@ -49,6 +50,7 @@ PySocks
 PyYAML
 QAT-ZSTD-Plugin
 QAT_engine
+QGIS
 QR-Code-generator
 QXlsx
 R
@@ -180,6 +182,7 @@ R-Ryacas
 R-SGP
 R-SGPdata
 R-SQUAREM
+R-SimDesign
 R-Sleuth2
 R-SnowballC
 R-SparseM
@@ -232,6 +235,7 @@ R-bayesplot
 R-bazar
 R-bbmle
 R-bdsmatrix
+R-beepr
 R-beeswarm
 R-bench
 R-benchr
@@ -584,6 +588,7 @@ R-linprog
 R-lintr
 R-listenv
 R-listviewer
+R-litedown
 R-lle
 R-lme4
 R-lmerTest
@@ -809,6 +814,7 @@ R-readr
 R-readstata13
 R-readxl
 R-recipes
+R-reformulas
 R-registry
 R-relimp
 R-rematch
@@ -824,7 +830,6 @@ R-reshape
 R-reshape2
 R-reticulate
 R-rex
-R-rgdal
 R-rgenoud
 R-rgeos
 R-rgl
@@ -871,6 +876,7 @@ R-rsvg
 R-runjags
 R-rversions
 R-rvest
+R-rworldmap
 R-s2
 R-sampling
 R-sandwich
@@ -916,6 +922,7 @@ R-sp
 R-spData
 R-spam
 R-sparkline
+R-sparsevctrs
 R-spatstat
 R-spatstat.core
 R-spatstat.data
@@ -1056,6 +1063,7 @@ SDL2_image
 SDL2_mixer
 SDL2_net
 SDL2_ttf
+SDL3
 SDL_gfx
 SDL_image
 SDL_mixer
@@ -1093,6 +1101,7 @@ accountsservice
 acl
 acpica-unix2
 ade
+adwaita-fonts
 adwaita-icon-theme
 akonadi
 akonadi-calendar
@@ -1123,6 +1132,7 @@ appstream-glib
 apr
 apr-util
 arandr
+ardopcf
 argon2
 aria2
 ark
@@ -1204,10 +1214,10 @@ boost
 borgbackup
 boto3
 botocore
+bottom
 bovo
 box2d
 bpftool
-bpftrace
 breeze
 breeze-gtk
 breeze-icons
@@ -1234,6 +1244,7 @@ buildreq-qmake
 buildreq-qt6
 buildreq-scons
 buildx
+bwidget
 byobu
 bz2file
 bzip2
@@ -1359,6 +1370,8 @@ compat-libsoup-soname-24
 compat-libva-soname1
 compat-libvpx-soname7
 compat-libvpx-soname8
+compat-libvpx-soname9
+compat-libxml2-soname2
 compat-pangomm-soname14
 compat-protobuf-soname29
 compat-protobuf-soname32
@@ -1369,6 +1382,7 @@ compat-taglib-soname1
 compat-tbb-soname2
 compat-tiff-soname5
 compat-wlroots-soname11
+compat-yaml-cpp-soname6
 component
 compose
 configobj
@@ -1384,6 +1398,7 @@ coreutils
 corosync
 coturn
 cov-core
+cpdb-libs
 cpio
 cppcheck
 cppunit
@@ -1526,6 +1541,7 @@ fakeroot
 falcosecurity-libs
 fann
 farstream
+fast_float
 fastfetch
 faultstat
 fcgi
@@ -1583,6 +1599,7 @@ fsearch
 fuse
 fwupd
 fwupd-efi
+game-music-emu
 garcon
 gawk
 gbinder-python
@@ -1593,6 +1610,7 @@ gcc11
 gcc7
 gcc8
 gcc9
+gccmakedep
 gcompris-qt
 gcr
 gdal
@@ -1621,6 +1639,7 @@ gi-docgen
 giflib
 gifsicle
 gimp
+gimp-xsanecli
 girara
 git
 git-gui
@@ -1749,6 +1768,7 @@ gstreamer-vaapi
 gtk+
 gtk-doc
 gtk-frdp
+gtk-layer-shell
 gtk-vnc
 gtk-xfce-engine
 gtk3
@@ -1842,6 +1862,7 @@ ipe
 iperf
 ipmitool
 ipp-crypto
+ipp-usb
 iproute2
 ipset
 iptables
@@ -1854,6 +1875,7 @@ irrlicht
 irrlichtmt
 irssi
 isa-l
+isl
 iso-codes
 isodate
 isomd5sum
@@ -2260,6 +2282,7 @@ libmbim
 libmediaart
 libmemcached
 libmicrohttpd
+libmikmod
 libmnl
 libmodbus
 libmodplug
@@ -2296,6 +2319,7 @@ libopenzwave
 libopusenc
 liborcus
 libosinfo
+libp11
 libpagemaker
 libpanel
 libpcap
@@ -2380,6 +2404,7 @@ libva
 libva-intel-driver
 libva-utils
 libvdpau
+libversion
 libvirt
 libvirt-dbus
 libvirt-glib
@@ -2433,6 +2458,7 @@ linux-ltscurrent
 linux-ltsprev
 linux-preempt-rt
 linux-tools
+linuxcnc
 linuxptp
 lksctp-tools
 lldpd
@@ -2442,6 +2468,7 @@ llvm15
 llvm16
 llvm17
 llvm18
+llvm19
 lm-sensors
 lmdb
 logrotate
@@ -2474,6 +2501,7 @@ m4
 mailcommon
 mailimporter
 make
+makedepend
 man-db
 man-pages
 man-pages-posix
@@ -2497,10 +2525,10 @@ memtier_benchmark
 menu-cache
 mercurial
 mesa
+mesa-clc
 mesa-demos
 meson
 messagelib
-meta-c-basic
 meta-desktop-gnome
 meta-os-core
 meta-os-core-plus
@@ -2523,6 +2551,7 @@ mingw-crt
 mingw-gcc
 minicom
 minimodem
+minizip-ng
 minuet
 mixer-tools
 mkfontdir
@@ -2626,6 +2655,7 @@ nload
 nlohmann_json
 nlopt
 nmap
+nng
 node-addon-api
 nodejs
 nose-parameterized
@@ -2648,6 +2678,7 @@ numactl
 numatop
 numlockx
 numpy-stl
+nushell
 nut
 nv-codec-headers
 nvme-cli
@@ -2712,6 +2743,7 @@ paho.mqtt.c
 paho.mqtt.cpp
 palapeli
 pam-python
+pam_u2f
 pam_wrapper
 pandas
 pandoc
@@ -3586,7 +3618,6 @@ perl-prefork
 perl-strictures
 pesign
 phonon
-phonon-vlc
 phoronix-test-suite
 php
 php-APCu
@@ -3646,7 +3677,6 @@ php-zmq
 picmi
 picocom
 pidgin
-pidgin-sipe
 pigeonhole
 pigz
 pim-data-exporter
@@ -3734,6 +3764,7 @@ pynvim
 pyotherside
 pyotp
 pyparted
+pypi-Yapps
 pypi-absl_py
 pypi-abydos
 pypi-accelerate
@@ -3915,6 +3946,7 @@ pypi-decorator
 pypi-deepmerge
 pypi-deepspeed
 pypi-dep_logic
+pypi-dependency_groups
 pypi-deprecated
 pypi-deprecation
 pypi-devpi_client
@@ -3977,6 +4009,7 @@ pypi-falcon
 pypi-fasteners
 pypi-fastimport
 pypi-fastjsonschema
+pypi-fido2
 pypi-filecache
 pypi-filelock
 pypi-findpython
@@ -4075,6 +4108,7 @@ pypi-hyperlink
 pypi-hypothesis
 pypi-icalendar
 pypi-icecream
+pypi-id
 pypi-identify
 pypi-idna
 pypi-idna_ssl
@@ -4099,8 +4133,8 @@ pypi-iocapture
 pypi-ipaddress
 pypi-ipdb
 pypi-ipykernel
-pypi-ipyparallel
 pypi-ipython
+pypi-ipython-pygments-lexers
 pypi-ipython_genutils
 pypi-ipython_sql
 pypi-ipywidgets
@@ -4152,7 +4186,6 @@ pypi-jupyterlab_server
 pypi-jupyterlab_widgets
 pypi-jupyterlite_core
 pypi-jupyterlite_pyodide_kernel
-pypi-jupyterlite_sphinx
 pypi-jxmlease
 pypi-kcc
 pypi-kerberos
@@ -4444,6 +4477,7 @@ pypi-pyroute2.nftables
 pypi-pyroute2.nslink
 pypi-pyrsistent
 pypi-pysaml2
+pypi-pyscard
 pypi-pyscss
 pypi-pyserial
 pypi-pysnow
@@ -4499,6 +4533,7 @@ pypi-rapidfuzz
 pypi-rapidfuzz_capi
 pypi-rcssmin
 pypi-rdflib
+pypi-re2
 pypi-readme_renderer
 pypi-readtime
 pypi-recommonmark
@@ -4519,7 +4554,6 @@ pypi-requirements_parser
 pypi-resolvelib
 pypi-responses
 pypi-restructuredtext_lint
-pypi-retrolab
 pypi-retry
 pypi-retry_decorator
 pypi-retryz
@@ -4530,6 +4564,7 @@ pypi-rfc3987
 pypi-rich
 pypi-rjsmin
 pypi-rlpycairo
+pypi-roman_numerals_py
 pypi-rope
 pypi-routes
 pypi-rpds_py
@@ -4700,10 +4735,12 @@ pypi-types_toml
 pypi-types_typed_ast
 pypi-types_urllib3
 pypi-typing_extensions
+pypi-typing_inspection
 pypi-typogrify
 pypi-tzdata
 pypi-tzlocal
 pypi-ua_parser
+pypi-ua_parser_builtins
 pypi-uc_micro_py
 pypi-ufolib2
 pypi-uharfbuzz
@@ -4724,6 +4761,7 @@ pypi-uvloop
 pypi-venusian
 pypi-verboselogs
 pypi-versioneer
+pypi-versioningit
 pypi-vine
 pypi-virtualenv
 pypi-volatile
@@ -4755,7 +4793,6 @@ pypi-wsproto
 pypi-wurlitzer
 pypi-wxPython
 pypi-xcffib
-pypi-xgboost
 pypi-xmldiff
 pypi-xmljson
 pypi-xmlschema
@@ -4783,6 +4820,7 @@ pypi-yarg
 pypi-yarl
 pypi-yattag
 pypi-ypy_websocket
+pypi-yubikey_manager
 pypi-zabbix_api
 pypi-zc.lockfile
 pypi-zeroconf
@@ -4804,6 +4842,7 @@ pypi-zope.security
 pypi-zope.testing
 pypi-zope.testrunner
 pypi-zopfli
+pystring
 python
 python-digitalocean
 python-distutils-extra
@@ -4928,6 +4967,7 @@ rage
 ragel
 rapidjson
 raptor2
+rasdaemon
 rasqal
 rclone
 rdfind
@@ -4940,6 +4980,7 @@ recode
 redis2-nginx-module
 redland
 redsocks
+redumper
 requests-ntlm
 rest
 restic
@@ -4973,6 +5014,7 @@ s3fs-fuse
 salt
 samba
 samtools
+sane-airscan
 sane-backends
 sassc
 sbc
@@ -4985,6 +5027,7 @@ scour
 scowl
 screen
 scummvm
+scx
 sddm
 sddm-kcm
 seahorse
@@ -5096,7 +5139,9 @@ tallow
 tar
 taskwarrior
 tbb
+tbtools
 tcl
+tclx
 tcpdump
 tdb
 tecla
@@ -5151,10 +5196,12 @@ udisks2
 udunits
 uget
 uhttpmock
+uhubctl
 umockdev
 unbundle
 unibilium
 unifdef
+unified-memory-framework
 unison
 unit
 unixODBC
@@ -5165,7 +5212,6 @@ usb-modeswitch-data
 usbredir
 usbutils
 userspace-rcu
-usrbinjava
 usrbinvi
 usrsctp
 utf8proc
@@ -5181,6 +5227,7 @@ valijson
 valkey
 vapoursynth
 vbox-integration
+vc-intrinsics
 vectorscan
 vid.stab
 vifm
@@ -5193,7 +5240,6 @@ virglrenderer
 virt-manager
 virt-viewer
 vkd3d
-vlc
 volk
 volume_key
 vpnc
@@ -5225,6 +5271,7 @@ wlroots
 wmctrl
 woff2
 wol
+wolfssl
 wpa_supplicant
 wsjtx
 wslu
@@ -5311,6 +5358,8 @@ xrandr
 xrdb
 xrdp
 xrestop
+xsane
+xscorch
 xscreensaver
 xsel
 xset
@@ -5337,6 +5386,7 @@ yelp-tools
 yelp-xsl
 yq
 ytnef
+yyjson
 zabbix
 zathura
 zathura-pdf-poppler
@@ -5344,6 +5394,7 @@ zenity
 zimg
 zip
 zlib
+zlib-ng
 znc
 zopfli
 zsh