packages update

Sometimes vendor repos get tagged but the package fails to update for
another reason. In this case the repo wouldn't have the new vendor
ARCHIVE set and new attempts to build would use the old vendor archive
causing failures. Force using the latest vendor tag as generally this
is what we want (if we get a bad vendor tag somehow, it should mean a
new tag needs to be created to replace it anyway).

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

Makefile.common

@@ -166,7 +166,7 @@ preautospec-checks:
 #help to autospec.
 #help For more information, see the project at https://github.com/clearlinux/autospec
 autospec: preautospec-checks pullrebase localreponotice clean-old-content
-	git rm --ignore-unmatch pumpAutospec
+	git rm --ignore-unmatch pumpAutospec || rm -f pumpAutospec
 	@if [ -e $(SPECFILE) ] && ! grep -q "# Generated by: autospec.py" $(SPECFILE) ; then \
 		echo "Specfile already exists and was not created by autospec.py! Aborting."; \
 		exit 1; \

licenses-extra

@@ -5,3 +5,4 @@ GFDL-1.3+
 MIT-Opengroup
 WXwindows
 w3c
+libpng-2.0

packages

@@ -26,6 +26,7 @@ LibreCAD
 Linux-PAM
 LuaJIT
 LyX
+MangoHud
 MarkupSafe
 ModemManager
 MuseScore
@@ -62,6 +63,8 @@ R-BMA
 R-BatchJobs
 R-BayesFactor
 R-BiasedUrn
+R-Biobase
+R-BiocGenerics
 R-BiocManager
 R-BoolNet
 R-BradleyTerry2
@@ -266,6 +269,7 @@ R-calibrator
 R-callr
 R-car
 R-carData
+R-cards
 R-caret
 R-cclust
 R-cellranger
@@ -355,6 +359,7 @@ R-drc
 R-dreamerr
 R-dtplyr
 R-dtw
+R-duckdb
 R-dygraphs
 R-dynamicTreeCut
 R-dynlm
@@ -660,6 +665,7 @@ R-mvnormtest
 R-mvoutlier
 R-mvtnorm
 R-nanoarrow
+R-nanoparquet
 R-natserv
 R-ncbit
 R-ncdf4
@@ -883,6 +889,7 @@ R-sessioninfo
 R-setRNG
 R-sets
 R-sf
+R-sfd
 R-sfsmisc
 R-sgeostat
 R-shape
@@ -1307,7 +1314,6 @@ cmocka
 cmrt
 cmus
 cnf
-cni
 cni-plugins
 cockpit
 codec2
@@ -1559,7 +1565,6 @@ freeglut
 freeipmi
 freetype
 fribidi
-fritzing-app
 frozen
 fs
 fsarchiver
@@ -1569,6 +1574,7 @@ fwupd
 fwupd-efi
 garcon
 gawk
+gbinder-python
 gc
 gcab
 gcc
@@ -1588,8 +1594,6 @@ gdm
 geany
 geany-plugins
 geary
-gedit
-gedit-plugins-gnome
 geeqie
 gegl
 gengetopt
@@ -1760,6 +1764,7 @@ help2man
 hexchat
 hexedit
 hicolor-icon-theme
+highway
 hiredis-c
 hostname
 howdy
@@ -1771,7 +1776,6 @@ hub
 hugo
 hunspell
 hwloc
-hyperscan
 hyphen
 i2c-tools
 i3
@@ -2180,6 +2184,7 @@ libfontenc
 libfprint
 libfreehand
 libftdi1
+libgbinder
 libgcrypt
 libgd
 libgdata
@@ -2188,6 +2193,7 @@ libgee
 libgeotiff
 libgit2
 libgit2-glib
+libglibutil
 libglvnd
 libgnome-keyring
 libgnomekbd
@@ -2272,6 +2278,7 @@ libodfgen
 libogg
 libopenmpt
 libopenzwave
+libopusenc
 liborcus
 libosinfo
 libpagemaker
@@ -2438,6 +2445,7 @@ luarocks
 lutris
 luv
 lv2
+lxc
 lynx
 lz4
 lzlib
@@ -3087,6 +3095,7 @@ perl-IPC-ShareLite
 perl-IPC-Shareable
 perl-IPC-System-Simple
 perl-Image-Base
+perl-Image-ExifTool
 perl-Image-Info
 perl-Image-Size
 perl-Image-Xbm
@@ -3440,7 +3449,6 @@ perl-Test-Without-Module
 perl-Test-YAML
 perl-Test-utf8
 perl-Test2-Plugin-NoWarnings
-perl-Test2-Suite
 perl-Text-Autoformat
 perl-Text-Brew
 perl-Text-CSV
@@ -3712,6 +3720,7 @@ pypi-acme
 pypi-adal
 pypi-aiodns
 pypi-aiofiles
+pypi-aiohappyeyeballs
 pypi-aiohttp
 pypi-aiohttp_cors
 pypi-aiosignal
@@ -3916,12 +3925,14 @@ pypi-docopt
 pypi-docstring_parser
 pypi-docstring_to_markdown
 pypi-docutils
+pypi-doit
 pypi-doxypypy
 pypi-doxyqml
 pypi-dpcontracts
 pypi-dulwich
 pypi-ecdsa
 pypi-editables
+pypi-einops
 pypi-elementpath
 pypi-enrich
 pypi-entrypoints
@@ -4118,6 +4129,9 @@ pypi-jupyterlab_link_share
 pypi-jupyterlab_pygments
 pypi-jupyterlab_server
 pypi-jupyterlab_widgets
+pypi-jupyterlite_core
+pypi-jupyterlite_pyodide_kernel
+pypi-jupyterlite_sphinx
 pypi-jxmlease
 pypi-kcc
 pypi-kerberos
@@ -4336,6 +4350,7 @@ pypi-pybind11
 pypi-pybtex
 pypi-pybtex_docutils
 pypi-pycares
+pypi-pyclip
 pypi-pyclipper
 pypi-pycodestyle
 pypi-pycollada
@@ -4608,6 +4623,7 @@ pypi-texttable
 pypi-threadpoolctl
 pypi-three_merge
 pypi-tifffile
+pypi-timm
 pypi-tinycss2
 pypi-tldextract
 pypi-tokenizers
@@ -4617,6 +4633,7 @@ pypi-tomli_w
 pypi-tomlkit
 pypi-toolz
 pypi-torchmetrics
+pypi-torchvision
 pypi-tornado
 pypi-tornado_xstatic
 pypi-tox
@@ -4795,8 +4812,10 @@ qemu
 qemu-guest-additions
 qgit
 qhull
+qmapshack
 qml-box2d
 qpdf
+qpl
 qqc2-desktop-style
 qrencode
 qscintilla
@@ -4894,7 +4913,6 @@ re2c
 readline
 rebootmgr
 recode
-redis-native
 redis2-nginx-module
 redland
 redsocks
@@ -4909,6 +4927,7 @@ rng-tools
 robin-map
 roboto
 rofi
+routino
 rpcbind
 rpcsvc-proto
 rpm
@@ -5084,6 +5103,7 @@ tig
 tigervnc
 time
 tini
+tinyxml2
 tiptop
 tk
 tmux
@@ -5134,7 +5154,10 @@ v4l-utils
 vala
 valgrind
 valijson
+valkey
+vapoursynth
 vbox-integration
+vectorscan
 vid.stab
 vifm
 vim
@@ -5147,12 +5170,14 @@ virt-manager
 virt-viewer
 vkd3d
 vlc
+volk
 volume_key
 vpnc
 vsqlite
 vte
 waffle
 wavpack
+waydroid
 wayland
 wayland-protocols
 waypipe
@@ -5166,10 +5191,12 @@ wget
 which
 whois
 wine
+winegui
 wireless-regdb-master
 wireplumber
 wireshark
 wl-clipboard
+wlrobs
 wlroots
 wmctrl
 woff2
@@ -5187,6 +5214,7 @@ xapian-core
 xastir
 xauth
 xbitmaps
+xboxdrv
 xcb-proto
 xcb-util-cursor
 xcb-util-xrm

vendor.py

@@ -76,11 +76,17 @@ def update_cargo_vendor(path, name, git):
     cargo_vendors = subprocess.run('cargo vendor', cwd=path, shell=True,
                                    check=True, stdout=subprocess.PIPE,
                                    universal_newlines=True).stdout
+    with open(os.path.join(vendor_path, ".gitattributes"), "w", encoding='utf8') as gafile:
+        gafile.write("* text=false\n")
     subprocess.run(f"cp -a {backup_vendor_git} {vendor_git}", cwd=path,
                    shell=True, check=True, stdout=subprocess.DEVNULL)
     repo = Repo(vendor_path)
     if not (len(repo.untracked_files) > 0 or repo.is_dirty()):
-        return False, ""
+        # Always use the newest tag as sometimes a new tag will
+        # be created but the package won't be updated to use it
+        # for a different failure reason.
+        tag = sorted(repo.tags, key=lambda x: x.name, reverse=True)[0]
+        return tag, cargo_vendors
     subprocess.run('git add .', cwd=vendor_path, shell=True, check=True,
                    stdout=subprocess.DEVNULL)
     subprocess.run('git commit -m "vendor update"', cwd=vendor_path,
@@ -137,7 +143,6 @@ def update_cargo_sources(name, tag, cargo_vendors):
 
 
 def main():
-    updated = False
     args = get_args()
 
     vtype = vendor_check()
@@ -148,13 +153,11 @@ def main():
     tdir = setup_content(args.url)
     if vtype == 'cargo':
         vdir = setup_cargo_vendor(tdir)
-        if vdir:
+        if not vdir:
+            print(args.archives)
+        else:
             tag, cargo_vendors = update_cargo_vendor(vdir, args.name, args.git)
-            if tag:
-                update_cargo_sources(args.name, tag, cargo_vendors)
-                updated = True
-    if not updated:
-        print(args.archives)
+            update_cargo_sources(args.name, tag, cargo_vendors)
     shutil.rmtree(tdir)