update to 6.5

1002-fedora-socket-is-in-run-incus.patch

@@ -1,34 +0,0 @@
-From 56f01aecc28a19ba1418ee418a83914ab079b6e2 Mon Sep 17 00:00:00 2001
-From: Neil Hanlon <neil@shrug.pw>
-Date: Tue, 20 Aug 2024 19:54:56 -0400
-Subject: [PATCH] fedora socket is in /run/incus
-
----
- cmd/lxd-to-incus/targets_systemd.go | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmd/lxd-to-incus/targets_systemd.go b/cmd/lxd-to-incus/targets_systemd.go
-index fb57a14..eb5d239 100644
---- a/cmd/lxd-to-incus/targets_systemd.go
-+++ b/cmd/lxd-to-incus/targets_systemd.go
-@@ -3,7 +3,7 @@ package main
- import (
- 	"time"
- 
--	"github.com/lxc/incus/v6/client"
-+	incus "github.com/lxc/incus/v6/client"
- 	"github.com/lxc/incus/v6/shared/subprocess"
- 	"github.com/lxc/incus/v6/shared/util"
- )
-@@ -37,7 +37,7 @@ func (s *targetSystemd) start() error {
- }
- 
- func (s *targetSystemd) connect() (incus.InstanceServer, error) {
--	return incus.ConnectIncusUnix("/var/lib/incus/unix.socket", &incus.ConnectionArgs{SkipGetServer: true})
-+	return incus.ConnectIncusUnix("/run/incus/unix.socket", &incus.ConnectionArgs{SkipGetServer: true})
- }
- 
- func (s *targetSystemd) paths() (*daemonPaths, error) {
--- 
-2.46.0
-

incus.spec

@@ -10,7 +10,7 @@
 
 # https://github.com/lxc/incus
 %global goipath github.com/lxc/incus
-Version:        6.4
+Version:        6.5
 
 %gometa
 
@@ -18,7 +18,7 @@ Version:        6.4
 %global golicenses COPYING
 
 Name:           incus
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        Powerful system container and virtual machine manager
 License:        Apache-2.0
 URL:            https://linuxcontainers.org/incus
@@ -59,7 +59,6 @@ Source203:      %{swaggerui_source_baseurl}/swagger-ui.css#/swagger-ui-%{swagger
 # Downstream only patches
 ## Allow offline builds
 Patch1001:      incus-0.2-doc-Remove-downloads-from-sphinx-build.patch
-Patch1002:      1002-fedora-socket-is-in-run-incus.patch
 
 %global bashcompletiondir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null || :)
 %global selinuxtype targeted
@@ -458,6 +457,10 @@ export CGO_LDFLAGS_ALLOW="(-Wl,-wrap,pthread_create)|(-Wl,-z,now)"
 %endif
 
 %changelog
+* Tue Sep 10 2024 Neil Hanlon <neil@rockylinux.org> - 6.5-1
+- update to 6.5
+- drop lxd-to-incus socket patch, available in upstream
+
 * Tue Aug 20 2024 Neil Hanlon <neil@shrug.pw> - 6.4-4
 - patch to use the right socket for lxd-to-incux
 

sources

@@ -1,4 +1,4 @@
-SHA512 (incus-6.4.tar.xz) = a9d32526cc7ccf93fe0579f95cbd87f72cecf13c5ebe9d0ee4a61a8f921737f1842ea35d452bdf58ca3d2c5529198e8d80dfee41ce6c92a6213f1994f421c1f6
+SHA512 (incus-6.5.tar.xz) = e5e9d0b7458052214813201c771c24e878c0682d749bb150fd477f5319a4dc1b641c963646ee5c16981d5698e941b62a4c5cc7a5f29e9f45eebf6a443dc029ec
 SHA512 (swagger-ui-5.17.2-bundle.js) = de5bc8c2bbb33c37da2a50fdc4c8d60cab3653e4a15bf7799dcd6ec537b97451c39e254d9746dbde9bdaf858ddb203af89c524f9cfce7034252110274606b511
 SHA512 (swagger-ui-5.17.2.css) = 32f6113a5286ddc0c13ec90c4203e690d81987ce4b21febccbb499df84c8a696881d0cf533fdd2ff262acc87ee7dd283263cc1f50bb5055eb74998e298990fbf
 SHA512 (swagger-ui-5.17.2-standalone-preset.js) = 1eb3996b1389d825aa7952774d51b98523ced51af17397d4b4103316d925303c803f5556867f26048b19178b28e7ebb51c93cdf16a856cd4ca52f9aab2bd0221