rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -51,3 +51,47 @@
 /syncthing-source-v1.12.0.tar.gz
 /syncthing-source-v1.12.1.tar.gz
 /syncthing-source-v1.13.1.tar.gz
+/syncthing-source-v1.14.0.tar.gz
+/syncthing-source-v1.15.1.tar.gz
+/syncthing-source-v1.16.1.tar.gz
+/syncthing-source-v1.17.0.tar.gz
+/syncthing-source-v1.18.0.tar.gz
+/syncthing-source-v1.18.1.tar.gz
+/syncthing-source-v1.18.2.tar.gz
+/syncthing-source-v1.18.3.tar.gz
+/syncthing-source-v1.18.4.tar.gz
+/syncthing-source-v1.18.5.tar.gz
+/syncthing-source-v1.18.6.tar.gz
+/syncthing-source-v1.19.1.tar.gz
+/syncthing-source-v1.19.2.tar.gz
+/syncthing-source-v1.20.1.tar.gz
+/syncthing-source-v1.20.2.tar.gz
+/syncthing-source-v1.20.3.tar.gz
+/syncthing-source-v1.20.4.tar.gz
+/syncthing-source-v1.21.0.tar.gz
+/syncthing-source-v1.22.0.tar.gz
+/syncthing-source-v1.23.0.tar.gz
+/syncthing-source-v1.23.1.tar.gz
+/syncthing-source-v1.23.2.tar.gz
+/syncthing-source-v1.23.4.tar.gz
+/syncthing-source-v1.23.5.tar.gz
+/syncthing-source-v1.23.6.tar.gz
+/syncthing-source-v1.23.7.tar.gz
+/syncthing-source-v1.24.0.tar.gz
+/syncthing-source-v1.25.0.tar.gz
+/syncthing-source-v1.26.0.tar.gz
+/syncthing-source-v1.26.1.tar.gz
+/syncthing-source-v1.27.1.tar.gz
+/syncthing-source-v1.27.2.tar.gz
+/syncthing-source-v1.27.3.tar.gz
+/syncthing-source-v1.27.4.tar.gz
+/syncthing-source-v1.27.6.tar.gz
+/syncthing-source-v1.27.7.tar.gz
+/syncthing-source-v1.27.9.tar.gz
+/syncthing-source-v1.27.12.tar.gz
+/syncthing-source-v1.28.0.tar.gz
+/syncthing-source-v1.28.1.tar.gz
+/syncthing-source-v1.29.3.tar.gz
+/syncthing-source-v1.29.5.tar.gz
+/syncthing-source-v1.29.6.tar.gz
+/syncthing-source-v1.30.0.tar.gz

0001-lib-api-api_test-fix-non-constant-format-string.patch

@@ -0,0 +1,25 @@
+From e983a6d622f5ddc7968fdf06bfc6cf0c027444eb Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Wed, 12 Mar 2025 16:42:24 +0100
+Subject: [PATCH 1/2] lib/api/api_test: fix non-constant format string
+
+---
+ lib/api/api_test.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/api/api_test.go b/lib/api/api_test.go
+index db5df49..301d41c 100644
+--- a/lib/api/api_test.go
++++ b/lib/api/api_test.go
+@@ -790,7 +790,7 @@ func TestHtmlFormLogin(t *testing.T) {
+ 				t.Errorf("Unexpected non-200 return code %d at %s", resp.StatusCode, noAuthPath)
+ 			}
+ 			if hasSessionCookie(resp.Cookies()) {
+-				t.Errorf("Unexpected session cookie at " + noAuthPath)
++				t.Errorf("Unexpected session cookie at %s", noAuthPath)
+ 			}
+ 		})
+ 	}
+-- 
+2.48.1
+

0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch

@@ -0,0 +1,34 @@
+From 4a9469f9969c646098a7d23d387aad150de1259c Mon Sep 17 00:00:00 2001
+From: Fabio Valentini <decathorpe@gmail.com>
+Date: Wed, 12 Mar 2025 16:53:32 +0100
+Subject: [PATCH 2/2] lib/ignore/ignore_test: fix non-constant format string
+
+---
+ lib/ignore/ignore_test.go | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/lib/ignore/ignore_test.go b/lib/ignore/ignore_test.go
+index 72a0c4d..6ca5267 100644
+--- a/lib/ignore/ignore_test.go
++++ b/lib/ignore/ignore_test.go
+@@ -1077,7 +1077,7 @@ func TestIssue4901(t *testing.T) {
+ 
+ 	fd, err := pats.fs.Create(".stignore")
+ 	if err != nil {
+-		t.Fatalf(err.Error())
++		t.Fatalf("%s", err.Error())
+ 	}
+ 	if _, err := fd.Write([]byte(stignore)); err != nil {
+ 		t.Fatal(err)
+@@ -1099,7 +1099,7 @@ func TestIssue4901(t *testing.T) {
+ 
+ 	fd, err = pats.fs.Create("unicorn-lazor-death")
+ 	if err != nil {
+-		t.Fatalf(err.Error())
++		t.Fatalf("%s", err.Error())
+ 	}
+ 	if _, err := fd.Write([]byte(" ")); err != nil {
+ 		t.Fatal(err)
+-- 
+2.48.1
+

0d64427.patch

@@ -1,104 +0,0 @@
-From 0d6442721aecadf685a16cca0ef874df468b2009 Mon Sep 17 00:00:00 2001
-From: Simon Frei <freisim93@gmail.com>
-Date: Tue, 3 Dec 2019 15:11:39 +0100
-Subject: [PATCH] lib/protocol: Decrease runtime/mem usage of bufferpool
- stresstest (ref #6209)
-
----
- lib/protocol/bufferpool_test.go | 58 +++++++++++++++++++++------------
- 1 file changed, 38 insertions(+), 20 deletions(-)
-
-diff --git a/lib/protocol/bufferpool_test.go b/lib/protocol/bufferpool_test.go
-index ab889ba88f..f7c6f67ce3 100644
---- a/lib/protocol/bufferpool_test.go
-+++ b/lib/protocol/bufferpool_test.go
-@@ -3,7 +3,6 @@
- package protocol
- 
- import (
--	"sync"
- 	"testing"
- 	"time"
- 
-@@ -70,18 +69,47 @@ func TestStressBufferPool(t *testing.T) {
- 	}
- 
- 	const routines = 10
--	const runtime = 2 * time.Second
- 
- 	bp := newBufferPool()
--	t0 := time.Now()
- 
--	var wg sync.WaitGroup
-+	timeout := time.After(2 * time.Second)
-+	done := make(chan struct{})
-+	checkDone := func() bool {
-+		if bp.puts == 0 || bp.skips == 0 || bp.misses == 0 {
-+			return false
-+		}
-+		var hits int64
-+		for _, h := range bp.hits {
-+			hits += h
-+		}
-+		return hits > 0
-+	}
-+
-+	go func() {
-+		for {
-+			select {
-+			case <-time.After(50 * time.Millisecond):
-+				if checkDone() {
-+					close(done)
-+					return
-+				}
-+			case <-timeout:
-+				return
-+			}
-+		}
-+	}()
-+
- 	fail := make(chan struct{}, routines)
- 	for i := 0; i < routines; i++ {
--		wg.Add(1)
- 		go func() {
--			defer wg.Done()
--			for time.Since(t0) < runtime {
-+			for {
-+				select {
-+				case <-done:
-+					return
-+				case <-timeout:
-+					return
-+				default:
-+				}
- 				blocks := make([][]byte, 10)
- 				for i := range blocks {
- 					// Request a block of random size with the range
-@@ -101,24 +129,14 @@ func TestStressBufferPool(t *testing.T) {
- 		}()
- 	}
- 
--	wg.Wait()
- 	select {
- 	case <-fail:
- 		t.Fatal("a block was bad size")
-+	case <-done:
-+	case <-timeout:
-+		t.Fatal("timed out before exercising all paths")
- 	default:
- 	}
--
--	t.Log(bp.puts, bp.skips, bp.misses, bp.hits)
--	if bp.puts == 0 || bp.skips == 0 || bp.misses == 0 {
--		t.Error("didn't exercise some paths")
--	}
--	var hits int64
--	for _, h := range bp.hits {
--		hits += h
--	}
--	if hits == 0 {
--		t.Error("didn't exercise some paths")
--	}
- }
- 
- func shouldPanic(t *testing.T, fn func()) {

README.md

@@ -1,3 +1,5 @@
+# syncthing
+
 ## Usage
 
 By default, the syncthing service isn't enabled after installation. Depending on

changelog

@@ -0,0 +1,278 @@
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Sat Jul 17 2021 Fabio Valentini <decathorpe@gmail.com> - 1.18.0-1
+- Update to version 1.18.0.
+
+* Tue Jun 15 2021 Fabio Valentini <decathorpe@gmail.com> - 1.17.0-1
+- Update to version 1.17.0.
+
+* Mon May 10 2021 Fabio Valentini <decathorpe@gmail.com> - 1.16.1-1
+- Update to version 1.16.1.
+
+* Mon Apr 12 2021 Fabio Valentini <decathorpe@gmail.com> - 1.15.1-1
+- Update to version 1.15.1.
+
+* Wed Mar 24 2021 Fabio Valentini <decathorpe@gmail.com> - 1.14.0-1
+- Update to version 1.14.0.
+
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.13.1-2
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
+* Thu Feb 04 2021 Fabio Valentini <decathorpe@gmail.com> - 1.13.1-1
+- Update to version 1.13.1.
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 08 2021 Fabio Valentini <decathorpe@gmail.com> - 1.12.1-1
+- Update to version 1.12.1.
+
+* Mon Dec 07 2020 Fabio Valentini <decathorpe@gmail.com> - 1.12.0-1
+- Update to version 1.12.0.
+
+* Wed Nov 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1.11.1-1
+- Update to version 1.11.1.
+
+* Tue Nov 03 2020 Fabio Valentini <decathorpe@gmail.com> - 1.11.0-1
+- Update to version 1.11.0.
+
+* Fri Oct 09 2020 Fabio Valentini <decathorpe@gmail.com> - 1.10.0-1
+- Update to version 1.10.0.
+
+* Tue Sep 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.9.0-1
+- Update to version 1.9.0.
+
+* Mon Sep 07 2020 Fabio Valentini <decathorpe@gmail.com> - 1.9.0~rc5-2
+- Use correct version format for build flags.
+
+* Sat Sep 05 2020 Carl George <carl@george.computer> - 1.9.0~rc5-1
+- Update to version 1.9.0-rc.5
+
+* Thu Aug 20 2020 Fabio Valentini <decathorpe@gmail.com> - 1.8.0-2
+- Include upstream patch to fix issues on ppc64le.
+
+* Sun Aug 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1.8.0-1
+- Update to version 1.8.0.
+
+* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-3
+- Second attempt - Rebuilt for
+  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Thu Jul 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1.7.1-1
+- Update to version 1.7.1.
+
+* Tue Jul 07 2020 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-1
+- Update to version 1.7.0.
+
+* Tue Jun 02 2020 Fabio Valentini <decathorpe@gmail.com> - 1.6.1-1
+- Update to version 1.6.1.
+
+* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 1.5.0-1
+- Update to version 1.5.0.
+
+* Wed Apr 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.2-1
+- Update to version 1.4.2.
+
+* Tue Mar 17 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.0-1
+- Update to version 1.4.0.
+
+* Tue Mar 03 2020 Fabio Valentini <decathorpe@gmail.com> - 1.3.4-2
+- Drop custom systemd user session preset file.
+  See: https://bugzilla.redhat.com/show_bug.cgi?id=1708297
+
+* Tue Feb 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.3.4-1
+- Update to version 1.3.4.
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jan 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.3.3-1
+- Update to version 1.3.3.
+
+* Tue Dec 03 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.2-2
+- Add proposed patch to fix tests running out of memory on 32 bit arches.
+
+* Tue Dec 03 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.2-1
+- Update to version 1.3.2.
+
+* Tue Nov 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.1-1
+- Update to version 1.3.1.
+- Update build scriptlet to match upstream build system changes.
+- Fix broken systemd_post scriptlet.
+
+* Thu Oct 10 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.0-1
+- Update to version 1.3.0.
+
+* Thu Sep 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2.2-1
+- Update to version 1.2.2.
+
+* Thu Aug 15 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2.1-1
+- Update to version 1.2.1.
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Tue Jul 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2.0-1
+- Update to version 1.2.0.
+
+* Sun Jun 16 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.4-2
+- Disable building -devel package by default.
+
+* Tue Jun 04 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.4-1
+- Update to version 1.1.4.
+
+* Tue May 21 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.3-1
+- Update to version 1.1.3.
+
+* Fri Apr 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.1-1
+- Update to version 1.1.1.
+
+* Thu Mar 07 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.0-2
+- Fix build tags for changed variable names.
+
+* Tue Mar 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.0-1
+- Update to version 1.1.0.
+
+* Tue Feb 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.1-1
+- Update to version 1.0.1.
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 07 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.0-1
+- Update to version 1.0.0.
+
+* Wed Dec 26 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.54-1
+- Update to version 0.14.54.
+- Switch back to using bundled dependencies.
+
+* Tue Dec 04 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.53-1
+- Update to version 0.14.53.
+
+* Tue Nov 06 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.52-1
+- Update to version 0.14.52.
+
+* Tue Oct 02 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.51-1
+- Update to version 0.14.51.
+
+* Sun Sep 30 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.50-2
+- Adapt to rollinghash v4.0.0 changes.
+
+* Tue Sep 11 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.50-1
+- Update to version 0.14.50.
+- Clean up .spec file and use new macros.
+- Drop upstreamed go1.11 patch.
+
+* Wed Jul 25 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.49-1
+- Update to version 0.14.49.
+- Drop upstreamed osext patch.
+- Add upstream patch to fix building tests with go 1.11.
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.48-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 05 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.48-1
+- Update to version 0.14.48.
+
+* Tue May 01 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.47-1
+- Update to version 0.14.47.
+
+* Wed Apr 04 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.46-1
+- Update to version 0.14.46.
+- Simplify .spec file and build process, and drop build system patches.
+
+* Tue Mar 06 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.45-1
+- Update to version 0.14.45.
+
+* Tue Feb 13 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.44-1
+- Update to version 0.14.44.
+
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.43-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Jan 09 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.43-1
+- Update to version 0.14.43.
+
+* Tue Dec 26 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.42-1
+- Update to version 0.14.42.
+
+* Tue Dec 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.41-1
+- Update to version 0.14.41.
+
+* Tue Nov 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.40-1
+- Update to version 0.14.40.
+
+* Wed Oct 11 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.39-1
+- Update to version 0.14.39.
+
+* Wed Sep 20 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.38-1
+- Update to version 0.14.38.
+- Add patch to use internal luhn version again.
+
+* Mon Sep 18 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.37-2
+- Rebuild for updated dependencies, fixing crashes.
+
+* Tue Sep 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.37-1
+- Update to version 0.14.37.
+
+* Tue Aug 15 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.36-2
+- Adapt patch to work on ppc64, where PIE isn't supported.
+
+* Sat Aug 12 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.36-1
+- Update to version 0.14.36.
+
+* Wed Aug 09 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.35-2
+- Add Provides for bundled JS libraries and adapt License tag.
+
+* Tue Aug 08 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.35-1
+- Update to version 0.14.35.
+
+* Tue Aug 08 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.34-1
+- Update to version 0.14.34.
+
+* Sat Aug 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.33-3
+- Add another missing ldflags argument.
+
+* Tue Aug 01 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.33-2
+- Adapt patched build script to use the correct LDFLAGS.
+
+* Tue Jul 25 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.33-1
+- Update to version 0.14.33.
+
+* Tue Jul 11 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.32-1
+- Update to version 0.14.32.
+
+* Tue Jun 27 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.31-1
+- Update to version 0.14.31.
+
+* Tue Jun 13 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.30-1
+- Update to version 0.14.30.
+
+* Tue May 30 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.29-1
+- Update to version 0.14.29.
+
+* Tue May 16 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.28-1
+- Update to version 0.14.28.
+
+* Tue Apr 25 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.27-1
+- Update to version 0.14.27.
+
+* Fri Apr 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.26-1
+- Update to version 0.14.26.
+
+* Tue Mar 21 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.25-1
+- Update to version 0.14.25.
+
+* Tue Mar 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.24-1
+- Update to version 0.14.24.
+
+* Tue Feb 28 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.23-2
+- Clean up spec file, remove bundled libs on fedora, add man pages.
+
+* Tue Feb 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.23-1
+- First package for fedora.

sources

@@ -1 +1 @@
-SHA512 (syncthing-source-v1.13.1.tar.gz) = 098429d193dabcf4020283e1f93503a855e87717f52aca9da2c81a5a02e4f6123f0ab7feb0d2313a239da033234bd10f75fec56c4004ddc8489e72c822680443
+SHA512 (syncthing-source-v1.30.0.tar.gz) = 30c69b4dc3373b915da39ecca85c785ecbb19f847b49c1e95e3c5d4417d02415e9a991d3b3d9984f7ae02594d4805c80cf86aba22e33456d352b76a9e5bd3fef

syncthing.spec

@@ -1,36 +1,35 @@
-%bcond_with devel
-
-%global basever 1.13.1
+%global basever 1.30.0
 #%%global rcnum   0
 
 Name:           syncthing
 Summary:        Continuous File Synchronization
 Version:        %{basever}%{?rcnum:~rc%{rcnum}}
-Release:        1%{?dist}
+Release:        %autorelease
 
 %global goipath github.com/syncthing/syncthing
 %global tag     v%{basever}%{?rcnum:-rc.%{rcnum}}
 
-%gometa
+%gometa -f
 
-# syncthing (MPLv2.0) bundles
+# syncthing (MPL-2.0) bundles
 # - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT),
-# - ForkAwesome (MIT and OFL and CC-BY 3.0), and
-# - a number of go packages (MIT and MPLv2.0 and BSD and ASL 2.0 and CC0 and ISC)
-License:        MPLv2.0 and MIT and OFL and CC-BY and BSD and ASL 2.0 and CC0 and ISC
+# - HumanizeDuration (MIT OR Unlicense),
+# - ForkAwesome (MIT, OFL-1.1, CC-BY-3.0), and
+# - a number of go packages (Apache-2.0, BSD-2-Clause, BSD-2-Clause-Views, BSD-3-Clause, ISC, MIT, MPL-2.0)
+License:        MPL-2.0 AND Apache-2.0 AND BSD-2-Clause AND BSD-2-Clause-Views AND BSD-3-Clause AND CC-BY-3.0 AND ISC AND MIT AND OFL-1.1 AND (Apache-2.0 OR MIT) AND (MIT OR Unlicense)
 
 URL:            https://syncthing.net
 # use official release tarball (contains vendored dependencies)
 Source0:        %{gourl}/releases/download/%{tag}/%{name}-source-%{tag}.tar.gz
 
-# rejected patch to fix tests running out of memory on 32 bit arches
-# See: https://github.com/syncthing/syncthing/issues/6209
-Patch0:         https://github.com/imsodin/syncthing/commit/0d64427.patch
+# fix compilation failures caused non-constant format strings
+Patch:          0001-lib-api-api_test-fix-non-constant-format-string.patch
+Patch:          0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  systemd
+BuildRequires:  systemd-rpm-macros
 
-%{?systemd_requires}
+Requires:       hicolor-icon-theme
 
 # assets in gui/default/vendor/*
 Provides:       bundled(angular) = 1.3.20
@@ -39,159 +38,196 @@ Provides:       bundled(angular-sanitize) = 1.3.20
 Provides:       bundled(angular-translate) = 2.9.0.1
 Provides:       bundled(angular-translate-loader-static-files) = 2.11.0
 Provides:       bundled(bootstrap) = 3.3.6
-Provides:       bundled(daterangepicker) = 3.0.0
-Provides:       bundled(ForkAwesome) = 1.1.2
+Provides:       bundled(daterangepicker) = 3.1
+Provides:       bundled(ForkAwesome) = 1.2.0
+Provides:       bundled(HumanizeDuration.js)
 Provides:       bundled(jquery) = 2.2.2
-Provides:       bundled(jquery-fancytree) = 2.28.1
+Provides:       bundled(jquery-fancytree) = 2.38.0
 Provides:       bundled(jquery-ui) = 1.12.1
 Provides:       bundled(moment) = 2.19.4
 
 # automatically generated Provides for bundled go dependencies
 # manually check licenses for new deps and update License tag if necessary
-# generate with "./vendor2provides.py path/to/vendor/modules.txt")
+# generate with "./vendor2provides.py path/to/vendor/modules.txt"
 
-# github.com/AudriusButkevicius/pfilter : MIT
-Provides:       bundled(golang(github.com/AudriusButkevicius/pfilter)) = c55ef61
-# github.com/AudriusButkevicius/recli : MPLv2.0
-Provides:       bundled(golang(github.com/AudriusButkevicius/recli)) = 0.0.5
+# github.com/AudriusButkevicius/recli : MPL-2.0
+Provides:       bundled(golang(github.com/AudriusButkevicius/recli)) = d000ce8
+# github.com/Azure/azure-sdk-for-go : MIT
+Provides:       bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azcore)) = 1.18.0
+Provides:       bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/internal)) = 1.11.1
+Provides:       bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.1
 # github.com/Azure/go-ntlmssp : MIT
-Provides:       bundled(golang(github.com/Azure/go-ntlmssp)) = 6637195
-# github.com/DataDog/zstd : BSD
-Provides:       bundled(golang(github.com/DataDog/zstd)) = 1.4.1
-# github.com/StackExchange/wmi : MIT
-Provides:       bundled(golang(github.com/StackExchange/wmi)) = cbe6696
+Provides:       bundled(golang(github.com/Azure/go-ntlmssp)) = 754e693
+# github.com/alecthomas/kong : MIT
+Provides:       bundled(golang(github.com/alecthomas/kong)) = 1.11.0
+# github.com/aws/aws-sdk-go : Apache-2.0
+Provides:       bundled(golang(github.com/aws/aws-sdk-go)) = 1.55.7
 # github.com/beorn7/perks : MIT
 Provides:       bundled(golang(github.com/beorn7/perks)) = 1.0.1
-# github.com/bkaradzic/go-lz4 : BSD
-Provides:       bundled(golang(github.com/bkaradzic/go-lz4)) = 7224d8d
+# github.com/calmh/incontainer : MIT
+Provides:       bundled(golang(github.com/calmh/incontainer)) = 1.0.0
 # github.com/calmh/xdr : MIT
-Provides:       bundled(golang(github.com/calmh/xdr)) = 1.1.0
-# github.com/ccding/go-stun : ASL 2.0
-Provides:       bundled(golang(github.com/ccding/go-stun)) = 0.1.2
-# github.com/certifi/gocertifi : MPLv2.0
-Provides:       bundled(golang(github.com/certifi/gocertifi)) = 2c3bb06
+Provides:       bundled(golang(github.com/calmh/xdr)) = 1.2.0
+# github.com/ccding/go-stun : Apache-2.0
+Provides:       bundled(golang(github.com/ccding/go-stun)) = 0.1.5
+# github.com/cenkalti/backoff : MIT
+Provides:       bundled(golang(github.com/cenkalti/backoff/v4)) = 4.3.0
+# github.com/certifi/gocertifi : MPL-2.0
+Provides:       bundled(golang(github.com/certifi/gocertifi)) = 431795d
 # github.com/cespare/xxhash : MIT
-Provides:       bundled(golang(github.com/cespare/xxhash)) = 1.1.0
-Provides:       bundled(golang(github.com/cespare/xxhash/v2)) = 2.1.1
-# github.com/cheekybits/genny : MIT
-Provides:       bundled(golang(github.com/cheekybits/genny)) = 1.0.0
+Provides:       bundled(golang(github.com/cespare/xxhash/v2)) = 2.3.0
 # github.com/chmduquesne/rollinghash : MIT
-Provides:       bundled(golang(github.com/chmduquesne/rollinghash)) = a60f8e7
+Provides:       bundled(golang(github.com/chmduquesne/rollinghash)) = 4.0.0+incompatible
+# github.com/coreos/go-semver : Apache-2.0
+Provides:       bundled(golang(github.com/coreos/go-semver)) = 0.3.1
 # github.com/cpuguy83/go-md2man : MIT
-Provides:       bundled(golang(github.com/cpuguy83/go-md2man/v2)) = f79a8a8
+Provides:       bundled(golang(github.com/cpuguy83/go-md2man/v2)) = 2.0.5
 # github.com/d4l3k/messagediff : MIT
 Provides:       bundled(golang(github.com/d4l3k/messagediff)) = 1.2.1
-# github.com/dchest/siphash : CC0
-Provides:       bundled(golang(github.com/dchest/siphash)) = 1.2.2
-# github.com/dgraph-io/badger : ASL 2.0
-Provides:       bundled(golang(github.com/dgraph-io/badger/v2)) = 2.0.3
-# github.com/dgraph-io/ristretto : ASL 2.0
-Provides:       bundled(golang(github.com/dgraph-io/ristretto)) = 8f368f2
-# github.com/dgryski/go-farm : MIT
-Provides:       bundled(golang(github.com/dgryski/go-farm)) = 6a90982
-# github.com/dustin/go-humanize : MIT
-Provides:       bundled(golang(github.com/dustin/go-humanize)) = 1.0.0
-# github.com/flynn-archive/go-shlex : ASL 2.0
-Provides:       bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97
-# github.com/getsentry/raven-go : BSD
+# github.com/davecgh/go-spew : ISC
+Provides:       bundled(golang(github.com/davecgh/go-spew)) = 1.1.1
+# github.com/ebitengine/purego : Apache-2.0
+Provides:       bundled(golang(github.com/ebitengine/purego)) = 0.8.3
+# github.com/fsnotify/fsnotify : BSD-3-Clause
+Provides:       bundled(golang(github.com/fsnotify/fsnotify)) = 1.7.0
+# github.com/getsentry/raven-go : BSD-3-Clause
 Provides:       bundled(golang(github.com/getsentry/raven-go)) = 0.2.0
 # github.com/go-asn1-ber/asn1-ber : MIT
-Provides:       bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 1.5.1
+Provides:       bundled(golang(github.com/go-asn1-ber/asn1-ber)) = 2923003
 # github.com/go-ldap/ldap : MIT
-Provides:       bundled(golang(github.com/go-ldap/ldap/v3)) = 3.2.4
+Provides:       bundled(golang(github.com/go-ldap/ldap/v3)) = 3.4.11
 # github.com/go-ole/go-ole : MIT
-Provides:       bundled(golang(github.com/go-ole/go-ole)) = 1.2.4
+Provides:       bundled(golang(github.com/go-ole/go-ole)) = 1.3.0
+# github.com/go-task/slim-sprig : MIT
+Provides:       bundled(golang(github.com/go-task/slim-sprig/v3)) = 3.0.0
 # github.com/gobwas/glob : MIT
 Provides:       bundled(golang(github.com/gobwas/glob)) = 0.2.3
-# github.com/gogo/protobuf : BSD
-Provides:       bundled(golang(github.com/gogo/protobuf)) = 1.3.1
-# github.com/golang/groupcache : ASL 2.0
-Provides:       bundled(golang(github.com/golang/groupcache)) = 8c9f03a
-# github.com/golang/protobuf : BSD
-Provides:       bundled(golang(github.com/golang/protobuf)) = 1.4.3
-# github.com/golang/snappy : BSD
-Provides:       bundled(golang(github.com/golang/snappy)) = 0.0.1
-# github.com/greatroar/blobloom : ASL 2.0
-Provides:       bundled(golang(github.com/greatroar/blobloom)) = 0.5.0
-# github.com/jackpal/gateway : BSD
-Provides:       bundled(golang(github.com/jackpal/gateway)) = 1.0.6
-# github.com/jackpal/go-nat-pmp : ASL 2.0
+# github.com/gofrs/flock : BSD-3-Clause
+Provides:       bundled(golang(github.com/gofrs/flock)) = 0.12.1
+# github.com/golang/snappy : BSD-3-Clause
+Provides:       bundled(golang(github.com/golang/snappy)) = 0.0.4
+# github.com/google/pprof : Apache-2.0
+Provides:       bundled(golang(github.com/google/pprof)) = 337e5dd
+# github.com/google/uuid : BSD-3-Clause
+Provides:       bundled(golang(github.com/google/uuid)) = 1.6.0
+# github.com/greatroar/blobloom : Apache-2.0
+Provides:       bundled(golang(github.com/greatroar/blobloom)) = 0.8.0
+# github.com/hashicorp/errwrap : MPL-2.0
+Provides:       bundled(golang(github.com/hashicorp/errwrap)) = 1.1.0
+# github.com/hashicorp/go-multierror : MPL-2.0
+Provides:       bundled(golang(github.com/hashicorp/go-multierror)) = 1.1.1
+# github.com/hashicorp/golang-lru : MPL-2.0
+Provides:       bundled(golang(github.com/hashicorp/golang-lru/v2)) = 2.0.7
+# github.com/jackpal/gateway : BSD-3-Clause
+Provides:       bundled(golang(github.com/jackpal/gateway)) = 1.0.16
+# github.com/jackpal/go-nat-pmp : Apache-2.0
 Provides:       bundled(golang(github.com/jackpal/go-nat-pmp)) = 1.0.2
-# github.com/julienschmidt/httprouter : BSD
+# github.com/jmespath/go-jmespath : Apache-2.0
+Provides:       bundled(golang(github.com/jmespath/go-jmespath)) = 0.4.0
+# github.com/julienschmidt/httprouter : BSD-3-Clause
 Provides:       bundled(golang(github.com/julienschmidt/httprouter)) = 1.3.0
 # github.com/kballard/go-shellquote : MIT
 Provides:       bundled(golang(github.com/kballard/go-shellquote)) = 95032a8
-# github.com/lib/pq : MIT
-Provides:       bundled(golang(github.com/lib/pq)) = 1.8.0
-# github.com/lucas-clemente/quic-go : MIT
-Provides:       bundled(golang(github.com/lucas-clemente/quic-go)) = 0.19.3
-# github.com/marten-seemann/qtls : BSD
-Provides:       bundled(golang(github.com/marten-seemann/qtls)) = 0.10.0
-# github.com/marten-seemann/qtls-go1-15 : BSD
-Provides:       bundled(golang(github.com/marten-seemann/qtls-go1-15)) = 0.1.1
-# github.com/maruel/panicparse : ASL 2.0
-Provides:       bundled(golang(github.com/maruel/panicparse)) = 1.5.1
-# github.com/mattn/go-isatty : MIT
-Provides:       bundled(golang(github.com/mattn/go-isatty)) = 0.0.12
-# github.com/matttproud/golang_protobuf_extensions : ASL 2.0
-Provides:       bundled(golang(github.com/matttproud/golang_protobuf_extensions)) = 1.0.1
-# github.com/minio/sha256-simd : ASL 2.0
-Provides:       bundled(golang(github.com/minio/sha256-simd)) = 0.1.1
+# github.com/lufia/plan9stats : BSD-3-Clause
+Provides:       bundled(golang(github.com/lufia/plan9stats)) = 873cd01
+# github.com/maruel/panicparse : Apache-2.0
+Provides:       bundled(golang(github.com/maruel/panicparse/v2)) = 2.5.0
+# github.com/maxbrunsfeld/counterfeiter : MIT
+Provides:       bundled(golang(github.com/maxbrunsfeld/counterfeiter/v6)) = 6.11.2
+# github.com/maxmind/geoipupdate : Apache-2.0 OR MIT
+Provides:       bundled(golang(github.com/maxmind/geoipupdate/v6)) = 6.1.0
 # github.com/miscreant/miscreant.go : MIT
 Provides:       bundled(golang(github.com/miscreant/miscreant.go)) = 26d3763
+# github.com/munnerz/goautoneg : BSD-3-Clause
+Provides:       bundled(golang(github.com/munnerz/goautoneg)) = a7dc8b6
+# github.com/nxadm/tail : MIT
+Provides:       bundled(golang(github.com/nxadm/tail)) = 1.4.11
+# github.com/onsi/ginkgo : MIT
+Provides:       bundled(golang(github.com/onsi/ginkgo/v2)) = 2.23.4
 # github.com/oschwald/geoip2-golang : ISC
-Provides:       bundled(golang(github.com/oschwald/geoip2-golang)) = 1.4.0
+Provides:       bundled(golang(github.com/oschwald/geoip2-golang)) = 1.11.0
 # github.com/oschwald/maxminddb-golang : ISC
-Provides:       bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.6.0
-# github.com/petermattis/goid : ASL 2.0
-Provides:       bundled(golang(github.com/petermattis/goid)) = b0b1615
-# github.com/pkg/errors : BSD
+Provides:       bundled(golang(github.com/oschwald/maxminddb-golang)) = 1.13.1
+# github.com/pierrec/lz4 : BSD-3-Clause
+Provides:       bundled(golang(github.com/pierrec/lz4/v4)) = 4.1.22
+# github.com/pkg/errors : BSD-2-Clause
 Provides:       bundled(golang(github.com/pkg/errors)) = 0.9.1
-# github.com/prometheus/client_golang : ASL 2.0
-Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.8.0
-# github.com/prometheus/client_model : ASL 2.0
-Provides:       bundled(golang(github.com/prometheus/client_model)) = 0.2.0
-# github.com/prometheus/common : ASL 2.0
-Provides:       bundled(golang(github.com/prometheus/common)) = 0.14.0
-# github.com/prometheus/procfs : ASL 2.0
-Provides:       bundled(golang(github.com/prometheus/procfs)) = 0.2.0
-# github.com/rcrowley/go-metrics : BSD
-Provides:       bundled(golang(github.com/rcrowley/go-metrics)) = 10cdbea
-# github.com/russross/blackfriday : BSD
-Provides:       bundled(golang(github.com/russross/blackfriday/v2)) = 2.0.1
-# github.com/sasha-s/go-deadlock : ASL 2.0
-Provides:       bundled(golang(github.com/sasha-s/go-deadlock)) = 0.2.0
-# github.com/shirou/gopsutil : BSD
-Provides:       bundled(golang(github.com/shirou/gopsutil/v3)) = 3.20.11
-# github.com/shurcooL/sanitized_anchor_name : MIT
-Provides:       bundled(golang(github.com/shurcooL/sanitized_anchor_name)) = 1.0.0
+# github.com/pmezard/go-difflib : BSD-3-Clause
+Provides:       bundled(golang(github.com/pmezard/go-difflib)) = 1.0.0
+# github.com/posener/complete : MIT
+Provides:       bundled(golang(github.com/posener/complete)) = 1.2.3
+# github.com/power-devops/perfstat : MIT
+Provides:       bundled(golang(github.com/power-devops/perfstat)) = 82ca368
+# github.com/prometheus/client_golang : Apache-2.0
+Provides:       bundled(golang(github.com/prometheus/client_golang)) = 1.22.0
+# github.com/prometheus/client_model : Apache-2.0
+Provides:       bundled(golang(github.com/prometheus/client_model)) = 0.6.1
+# github.com/prometheus/common : Apache-2.0
+Provides:       bundled(golang(github.com/prometheus/common)) = 0.62.0
+# github.com/prometheus/procfs : Apache-2.0
+Provides:       bundled(golang(github.com/prometheus/procfs)) = 0.15.1
+# github.com/puzpuzpuz/xsync : Apache-2.0
+Provides:       bundled(golang(github.com/puzpuzpuz/xsync/v3)) = 3.5.1
+# github.com/quic-go/quic-go : MIT
+Provides:       bundled(golang(github.com/quic-go/quic-go)) = 0.52.0
+# github.com/rabbitmq/amqp091-go : BSD-2-Clause
+Provides:       bundled(golang(github.com/rabbitmq/amqp091-go)) = 1.10.0
+# github.com/rcrowley/go-metrics : BSD-2-Clause-Views
+Provides:       bundled(golang(github.com/rcrowley/go-metrics)) = 65e299d
+# github.com/riywo/loginshell : MIT
+Provides:       bundled(golang(github.com/riywo/loginshell)) = 7d26008
+# github.com/russross/blackfriday : BSD-2-Clause
+Provides:       bundled(golang(github.com/russross/blackfriday/v2)) = 2.1.0
+# github.com/shirou/gopsutil : BSD-3-Clause
+Provides:       bundled(golang(github.com/shirou/gopsutil/v4)) = 4.25.4
+# github.com/stretchr/objx : MIT
+Provides:       bundled(golang(github.com/stretchr/objx)) = 0.5.2
+# github.com/stretchr/testify : MIT
+Provides:       bundled(golang(github.com/stretchr/testify)) = 1.10.0
 # github.com/syncthing/notify : MIT
-Provides:       bundled(golang(github.com/syncthing/notify)) = 17de266
-# github.com/syndtr/goleveldb : BSD
-Provides:       bundled(golang(github.com/syndtr/goleveldb)) = d9e9293
+Provides:       bundled(golang(github.com/syncthing/notify)) = c7027d4
+# github.com/syndtr/goleveldb : BSD-2-Clause
+Provides:       bundled(golang(github.com/syndtr/goleveldb)) = 126854a
 # github.com/thejerf/suture : MIT
-Provides:       bundled(golang(github.com/thejerf/suture/v4)) = 4.0.0
+Provides:       bundled(golang(github.com/thejerf/suture/v4)) = 4.0.6
+# github.com/tklauser/go-sysconf : BSD-3-Clause
+Provides:       bundled(golang(github.com/tklauser/go-sysconf)) = 0.3.14
+# github.com/tklauser/numcpus : Apache-2.0
+Provides:       bundled(golang(github.com/tklauser/numcpus)) = 0.9.0
 # github.com/urfave/cli : MIT
-Provides:       bundled(golang(github.com/urfave/cli)) = 1.22.4
-# github.com/vitrun/qart : ASL 2.0 and BSD
+Provides:       bundled(golang(github.com/urfave/cli)) = 1.22.16
+# github.com/vitrun/qart : Apache-2.0 AND BSD-3-Clause
 Provides:       bundled(golang(github.com/vitrun/qart)) = bf64b92
-# golang.org/x/crypto : BSD
-Provides:       bundled(golang(golang.org/x/crypto)) = 9e8e0b3
-# golang.org/x/net : BSD
-Provides:       bundled(golang(golang.org/x/net)) = ff519b6
-# golang.org/x/sys : BSD
-Provides:       bundled(golang(golang.org/x/sys)) = da20708
-# golang.org/x/text: BSD
-Provides:       bundled(golang(golang.org/x/text)) = 0.3.4
-# golang.org/x/time : BSD
-Provides:       bundled(golang(golang.org/x/time)) = 3af7569
-# google.golang.org/protobuf : BSD
-Provides:       bundled(golang(google.golang.org/protobuf)) = 1.23.0
-
-# an inotify filesystem watcher is integrated with syncthing now
-Provides:       syncthing-inotify = 0.8.7-5
-Obsoletes:      syncthing-inotify < 0.8.7-5
-
+# github.com/willabides/kongplete : MIT
+Provides:       bundled(golang(github.com/willabides/kongplete)) = 0.4.0
+# github.com/yusufpapurcu/wmi : MIT
+Provides:       bundled(golang(github.com/yusufpapurcu/wmi)) = 1.2.4
+# go.uber.org/automaxprocs : MIT
+Provides:       bundled(golang(go.uber.org/automaxprocs)) = 1.6.0
+# go.uber.org/mock : Apache-2.0
+Provides:       bundled(golang(go.uber.org/mock)) = 0.5.2
+# golang.org/x/crypto : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/crypto)) = 0.38.0
+# golang.org/x/mod : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/mod)) = 0.24.0
+# golang.org/x/net : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/net)) = 0.40.0
+# golang.org/x/sync : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/sync)) = 0.14.0
+# golang.org/x/sys : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/sys)) = 0.33.0
+# golang.org/x/text : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/text)) = 0.25.0
+# golang.org/x/time : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/time)) = 0.11.0
+# golang.org/x/tools : BSD-3-Clause
+Provides:       bundled(golang(golang.org/x/tools)) = 0.33.0
+# google.golang.org/protobuf : BSD-3-Clause
+Provides:       bundled(golang(google.golang.org/protobuf)) = 1.36.6
+# gopkg.in/yaml.v3 : MIT AND Apache-2.0
+Provides:       bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
+# sigs.k8s.io/yaml : MIT AND BSD-3-Clause AND (MIT OR Apache-2.0)
+Provides:       bundled(golang(sigs.k8s.io/yaml)) = 1.4.0
 
 %description
 Syncthing replaces other file synchronization services with something
@@ -203,23 +239,6 @@ that control is returned to you.
 This package contains the syncthing client binary and systemd services.
 
 
-%if %{with devel}
-%package        devel
-Summary:        Continuous File Synchronization (development files)
-BuildArch:      noarch
-
-%description    devel
-Syncthing replaces other file synchronization services with something
-open, trustworthy and decentralized. Your data is your data alone and
-you deserve to choose where it is stored, if it is shared with some
-third party and how it's transmitted over the Internet. Using syncthing,
-that control is returned to you.
-
-This package contains the syncthing sources, which are needed as
-dependency for building packages using syncthing.
-%endif
-
-
 %package        tools
 Summary:        Continuous File Synchronization (server tools)
 
@@ -238,19 +257,6 @@ This package contains the main syncthing server tools:
   to connect to indirectly over the internet.
 
 
-%package        cli
-Summary:        Continuous File Synchronization (CLI)
-
-%description    cli
-Syncthing replaces other file synchronization services with something
-open, trustworthy and decentralized. Your data is your data alone and
-you deserve to choose where it is stored, if it is shared with some
-third party and how it's transmitted over the Internet. Using syncthing,
-that control is returned to you.
-
-This package contains the CLI program.
-
-
 %prep
 %autosetup -n %{name} -p1
 
@@ -293,10 +299,7 @@ export LDFLAGS="-X %{goipath}/lib/build.Program=strelaysrv $COMMON_LDFLAGS"
 %gobuild -o _bin/strelaysrv %{goipath}/cmd/strelaysrv
 
 export LDFLAGS="-X %{goipath}/lib/build.Program=strelaypoolsrv $COMMON_LDFLAGS"
-%gobuild -o _bin/strelaypoolsrv %{goipath}/cmd/strelaypoolsrv
-
-export LDFLAGS="-X %{goipath}/lib/build.Program=stcli $COMMON_LDFLAGS"
-%gobuild -o _bin/stcli %{goipath}/cmd/stcli
+%gobuild -o _bin/strelaypoolsrv %{goipath}/cmd/infra/strelaypoolsrv
 
 
 %install
@@ -309,7 +312,6 @@ cp -pav _bin/syncthing %{buildroot}/%{_bindir}/
 cp -pav _bin/stdiscosrv %{buildroot}/%{_bindir}/
 cp -pav _bin/strelaysrv %{buildroot}/%{_bindir}/
 cp -pav _bin/strelaypoolsrv %{buildroot}/%{_bindir}/
-cp -pav _bin/stcli %{buildroot}/%{_bindir}/
 
 # install man pages
 mkdir -p %{buildroot}/%{_mandir}/man1
@@ -322,46 +324,57 @@ cp -pav ./man/*.7 %{buildroot}/%{_mandir}/man7/
 cp -pav ./man/stdiscosrv.1 %{buildroot}/%{_mandir}/man1/
 cp -pav ./man/strelaysrv.1 %{buildroot}/%{_mandir}/man1/
 
+# install desktop files and icons
+mkdir -p %{buildroot}/%{_datadir}/applications
+cp -pav etc/linux-desktop/syncthing-start.desktop %{buildroot}/%{_datadir}/applications/
+cp -pav etc/linux-desktop/syncthing-ui.desktop %{buildroot}/%{_datadir}/applications/
+
+for size in 32 64 128 256 512; do
+    mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/${size}x${size}/apps
+    cp -pav assets/logo-${size}.png %{buildroot}/%{_datadir}/icons/hicolor/${size}x${size}/apps/syncthing.png
+done
+mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps
+cp -pav assets/logo-only.svg %{buildroot}/%{_datadir}/icons/hicolor/scalable/apps/syncthing.svg
+
 # install systemd units
 mkdir -p %{buildroot}/%{_unitdir}
 mkdir -p %{buildroot}/%{_userunitdir}
 
 cp -pav etc/linux-systemd/system/syncthing@.service %{buildroot}/%{_unitdir}/
-cp -pav etc/linux-systemd/system/syncthing-resume.service %{buildroot}/%{_unitdir}/
 cp -pav etc/linux-systemd/user/syncthing.service %{buildroot}/%{_userunitdir}/
 
-# Unmark source files as executable
-for i in $(find -name "*.go" -executable -print); do
+# unmark source files as executable
+for i in $(find -name "*.go" -type f -executable -print); do
     chmod a-x $i;
 done
 
-%if %{with devel}
-%goinstall
-%endif
-
 
 %check
-# restore executable bit on a folder ending in .go
-# (likely caused by a bug in a brp script)
-chmod +x vendor/github.com/miscreant/miscreant.go
+desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop
 
 export LANG=C.utf8
 export GOPATH=$(pwd)/_build:%{gopath}
 export GO111MODULE=off
 
 %gotest %{goipath}/cmd/stdiscosrv
-%gotest %{goipath}/cmd/strelaypoolsrv
+%gotest %{goipath}/cmd/infra/strelaypoolsrv
 %gotest %{goipath}/cmd/syncthing
-
 %gotest %{goipath}/lib/api
 %gotest %{goipath}/lib/beacon
 %gotest %{goipath}/lib/config
-%gotest %{goipath}/lib/connections
+
+# This test times out on s390x
+%gotest %{goipath}/lib/connections || :
+
 %gotest %{goipath}/lib/db
 %gotest %{goipath}/lib/dialer
 %gotest %{goipath}/lib/discover
 %gotest %{goipath}/lib/events
-%gotest %{goipath}/lib/fs
+
+# This test fails on SELinux-enabled systems:
+# https://github.com/syncthing/syncthing/issues/8601
+%gotest %{goipath}/lib/fs || :
+
 %gotest %{goipath}/lib/ignore
 %gotest %{goipath}/lib/logger
 
@@ -377,14 +390,17 @@ export GO111MODULE=off
 %gotest %{goipath}/lib/relay/client
 %gotest %{goipath}/lib/relay/protocol
 %gotest %{goipath}/lib/scanner
+%gotest %{goipath}/lib/semaphore
 %gotest %{goipath}/lib/signature
 %gotest %{goipath}/lib/stats
+%gotest %{goipath}/lib/stringutil
+%gotest %{goipath}/lib/structutil
+%gotest %{goipath}/lib/svcutil
 %gotest %{goipath}/lib/sync
 %gotest %{goipath}/lib/syncthing
 %gotest %{goipath}/lib/tlsutil
 %gotest %{goipath}/lib/upgrade
 %gotest %{goipath}/lib/upnp
-%gotest %{goipath}/lib/util
 
 # This test sometimes fails dependent on load on some architectures:
 # https://github.com/syncthing/syncthing/issues/4351
@@ -413,10 +429,12 @@ export GO111MODULE=off
 
 %{_bindir}/syncthing
 
+%{_datadir}/applications/syncthing*.desktop
+%{_datadir}/icons/hicolor/*/apps/syncthing.*
+
 %{_mandir}/*/syncthing*
 
 %{_unitdir}/syncthing@.service
-%{_unitdir}/syncthing-resume.service
 %{_userunitdir}/syncthing.service
 
 
@@ -432,275 +450,5 @@ export GO111MODULE=off
 %{_mandir}/man1/strelaysrv*
 
 
-%files cli
-%license LICENSE
-%doc README.md AUTHORS
-
-%{_bindir}/stcli
-
-
-%if %{with devel}
-%files devel -f devel.file-list
-%license LICENSE
-%doc README.md AUTHORS
-%endif
-
-
 %changelog
-* Thu Feb 04 2021 Fabio Valentini <decathorpe@gmail.com> - 1.13.1-1
-- Update to version 1.13.1.
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 08 2021 Fabio Valentini <decathorpe@gmail.com> - 1.12.1-1
-- Update to version 1.12.1.
-
-* Mon Dec 07 2020 Fabio Valentini <decathorpe@gmail.com> - 1.12.0-1
-- Update to version 1.12.0.
-
-* Wed Nov 18 2020 Fabio Valentini <decathorpe@gmail.com> - 1.11.1-1
-- Update to version 1.11.1.
-
-* Tue Nov 03 2020 Fabio Valentini <decathorpe@gmail.com> - 1.11.0-1
-- Update to version 1.11.0.
-
-* Fri Oct 09 2020 Fabio Valentini <decathorpe@gmail.com> - 1.10.0-1
-- Update to version 1.10.0.
-
-* Tue Sep 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.9.0-1
-- Update to version 1.9.0.
-
-* Mon Sep 07 2020 Fabio Valentini <decathorpe@gmail.com> - 1.9.0~rc5-2
-- Use correct version format for build flags.
-
-* Sat Sep 05 2020 Carl George <carl@george.computer> - 1.9.0~rc5-1
-- Update to version 1.9.0-rc.5
-
-* Thu Aug 20 2020 Fabio Valentini <decathorpe@gmail.com> - 1.8.0-2
-- Include upstream patch to fix issues on ppc64le.
-
-* Sun Aug 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1.8.0-1
-- Update to version 1.8.0.
-
-* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-3
-- Second attempt - Rebuilt for
-  https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jul 16 2020 Fabio Valentini <decathorpe@gmail.com> - 1.7.1-1
-- Update to version 1.7.1.
-
-* Tue Jul 07 2020 Fabio Valentini <decathorpe@gmail.com> - 1.7.0-1
-- Update to version 1.7.0.
-
-* Tue Jun 02 2020 Fabio Valentini <decathorpe@gmail.com> - 1.6.1-1
-- Update to version 1.6.1.
-
-* Sat May 09 2020 Fabio Valentini <decathorpe@gmail.com> - 1.5.0-1
-- Update to version 1.5.0.
-
-* Wed Apr 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.2-1
-- Update to version 1.4.2.
-
-* Tue Mar 17 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.0-1
-- Update to version 1.4.0.
-
-* Tue Mar 03 2020 Fabio Valentini <decathorpe@gmail.com> - 1.3.4-2
-- Drop custom systemd user session preset file.
-  See: https://bugzilla.redhat.com/show_bug.cgi?id=1708297
-
-* Tue Feb 04 2020 Fabio Valentini <decathorpe@gmail.com> - 1.3.4-1
-- Update to version 1.3.4.
-
-* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Wed Jan 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.3.3-1
-- Update to version 1.3.3.
-
-* Tue Dec 03 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.2-2
-- Add proposed patch to fix tests running out of memory on 32 bit arches.
-
-* Tue Dec 03 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.2-1
-- Update to version 1.3.2.
-
-* Tue Nov 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.1-1
-- Update to version 1.3.1.
-- Update build scriptlet to match upstream build system changes.
-- Fix broken systemd_post scriptlet.
-
-* Thu Oct 10 2019 Fabio Valentini <decathorpe@gmail.com> - 1.3.0-1
-- Update to version 1.3.0.
-
-* Thu Sep 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2.2-1
-- Update to version 1.2.2.
-
-* Thu Aug 15 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2.1-1
-- Update to version 1.2.1.
-
-* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue Jul 09 2019 Fabio Valentini <decathorpe@gmail.com> - 1.2.0-1
-- Update to version 1.2.0.
-
-* Sun Jun 16 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.4-2
-- Disable building -devel package by default.
-
-* Tue Jun 04 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.4-1
-- Update to version 1.1.4.
-
-* Tue May 21 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.3-1
-- Update to version 1.1.3.
-
-* Fri Apr 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.1-1
-- Update to version 1.1.1.
-
-* Thu Mar 07 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.0-2
-- Fix build tags for changed variable names.
-
-* Tue Mar 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.1.0-1
-- Update to version 1.1.0.
-
-* Tue Feb 05 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.1-1
-- Update to version 1.0.1.
-
-* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 07 2019 Fabio Valentini <decathorpe@gmail.com> - 1.0.0-1
-- Update to version 1.0.0.
-
-* Wed Dec 26 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.54-1
-- Update to version 0.14.54.
-- Switch back to using bundled dependencies.
-
-* Tue Dec 04 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.53-1
-- Update to version 0.14.53.
-
-* Tue Nov 06 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.52-1
-- Update to version 0.14.52.
-
-* Tue Oct 02 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.51-1
-- Update to version 0.14.51.
-
-* Sun Sep 30 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.50-2
-- Adapt to rollinghash v4.0.0 changes.
-
-* Tue Sep 11 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.50-1
-- Update to version 0.14.50.
-- Clean up .spec file and use new macros.
-- Drop upstreamed go1.11 patch.
-
-* Wed Jul 25 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.49-1
-- Update to version 0.14.49.
-- Drop upstreamed osext patch.
-- Add upstream patch to fix building tests with go 1.11.
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.48-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jun 05 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.48-1
-- Update to version 0.14.48.
-
-* Tue May 01 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.47-1
-- Update to version 0.14.47.
-
-* Wed Apr 04 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.46-1
-- Update to version 0.14.46.
-- Simplify .spec file and build process, and drop build system patches.
-
-* Tue Mar 06 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.45-1
-- Update to version 0.14.45.
-
-* Tue Feb 13 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.44-1
-- Update to version 0.14.44.
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.43-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Tue Jan 09 2018 Fabio Valentini <decathorpe@gmail.com> - 0.14.43-1
-- Update to version 0.14.43.
-
-* Tue Dec 26 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.42-1
-- Update to version 0.14.42.
-
-* Tue Dec 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.41-1
-- Update to version 0.14.41.
-
-* Tue Nov 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.40-1
-- Update to version 0.14.40.
-
-* Wed Oct 11 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.39-1
-- Update to version 0.14.39.
-
-* Wed Sep 20 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.38-1
-- Update to version 0.14.38.
-- Add patch to use internal luhn version again.
-
-* Mon Sep 18 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.37-2
-- Rebuild for updated dependencies, fixing crashes.
-
-* Tue Sep 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.37-1
-- Update to version 0.14.37.
-
-* Tue Aug 15 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.36-2
-- Adapt patch to work on ppc64, where PIE isn't supported.
-
-* Sat Aug 12 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.36-1
-- Update to version 0.14.36.
-
-* Wed Aug 09 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.35-2
-- Add Provides for bundled JS libraries and adapt License tag.
-
-* Tue Aug 08 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.35-1
-- Update to version 0.14.35.
-
-* Tue Aug 08 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.34-1
-- Update to version 0.14.34.
-
-* Sat Aug 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.33-3
-- Add another missing ldflags argument.
-
-* Tue Aug 01 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.33-2
-- Adapt patched build script to use the correct LDFLAGS.
-
-* Tue Jul 25 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.33-1
-- Update to version 0.14.33.
-
-* Tue Jul 11 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.32-1
-- Update to version 0.14.32.
-
-* Tue Jun 27 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.31-1
-- Update to version 0.14.31.
-
-* Tue Jun 13 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.30-1
-- Update to version 0.14.30.
-
-* Tue May 30 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.29-1
-- Update to version 0.14.29.
-
-* Tue May 16 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.28-1
-- Update to version 0.14.28.
-
-* Tue Apr 25 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.27-1
-- Update to version 0.14.27.
-
-* Fri Apr 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.26-1
-- Update to version 0.14.26.
-
-* Tue Mar 21 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.25-1
-- Update to version 0.14.25.
-
-* Tue Mar 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.24-1
-- Update to version 0.14.24.
-
-* Tue Feb 28 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.23-2
-- Clean up spec file, remove bundled libs on fedora, add man pages.
-
-* Tue Feb 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.14.23-1
-- First package for fedora.
-
+%autochangelog

vendor2provides.py

@@ -6,7 +6,8 @@
 # Parse modules.txt files into rpm .spec file Provides for bundled dependencies.
 # Written by Fabio "decathorpe" Valentini <decathorpe@fedoraproject.org> for
 # the fedora syncthing package: https://src.fedoraproject.org/rpms/syncthing
-# SPDX-License-Identifier: CC0-1.0 OR Unlicense
+#
+# SPDX-License-Identifier: Unlicense
 
 import os
 import sys
@@ -30,7 +31,7 @@ def main() -> int:
     # parse vendored dependencies into (import path, version) pairs
     vendored = list()
     for dep in dependencies:
-        ipath, version = dep[2:].split(" ")
+        ipath, version = dep[2:].split(" ")[:2]
 
         # check for git snapshots
         if len(version) > 27: