diff --git a/.gitignore b/.gitignore index eb1f9f1..96d755b 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,11 @@ /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 diff --git a/0001-lib-api-api_test-fix-non-constant-format-string.patch b/0001-lib-api-api_test-fix-non-constant-format-string.patch new file mode 100644 index 0000000..20f22c2 --- /dev/null +++ b/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 +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 + diff --git a/0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch b/0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch deleted file mode 100644 index 5ff73d6..0000000 --- a/0001-lib-api-api_test-increase-timeout-from-1-second-to-6.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0eb79d77f145cb6794ab31506e7a40bdfbbdef10 Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Mon, 11 Mar 2024 14:03:37 +0100 -Subject: [PATCH] lib/api/api_test: increase timeout from 1 second to 60 - seconds - -When run in parellel, 1 second is not enough for tests to work reliably. ---- - 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 cfdcb42..8badf19 100644 ---- a/lib/api/api_test.go -+++ b/lib/api/api_test.go -@@ -444,7 +444,7 @@ func TestAPIServiceRequests(t *testing.T) { - // testHTTPRequest tries the given test case, comparing the result code, - // content type, and result prefix. - func testHTTPRequest(t *testing.T, baseURL string, tc httpTestCase, apikey string) { -- timeout := time.Second -+ timeout := 60 * time.Second - if tc.Timeout > 0 { - timeout = tc.Timeout - } --- -2.44.0 - diff --git a/0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch b/0002-lib-ignore-ignore_test-fix-non-constant-format-strin.patch new file mode 100644 index 0000000..68eb294 --- /dev/null +++ b/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 +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 + diff --git a/sources b/sources index 4fc3b8f..cb41ca6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (syncthing-source-v1.27.7.tar.gz) = 7eee3a021ed2411078928c92f5af52c100f717dfc53adc1d4b05050178040c4d30e39d1d5a4d8de3b49db0866957a3c3b5000e4810ecaebde16f6e9073fabf7a +SHA512 (syncthing-source-v1.30.0.tar.gz) = 30c69b4dc3373b915da39ecca85c785ecbb19f847b49c1e95e3c5d4417d02415e9a991d3b3d9984f7ae02594d4805c80cf86aba22e33456d352b76a9e5bd3fef diff --git a/syncthing.spec b/syncthing.spec index 0c4e09d..563d026 100644 --- a/syncthing.spec +++ b/syncthing.spec @@ -1,6 +1,4 @@ -%bcond_with devel - -%global basever 1.27.7 +%global basever 1.30.0 #%%global rcnum 0 Name: syncthing @@ -15,17 +13,18 @@ Release: %autorelease # syncthing (MPL-2.0) bundles # - angular, bootstrap, daterangepicker, fancytree, jQuery, moment (MIT), +# - 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 +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 -# * increase some test timeouts to fix failures when running tests in parallel: -# https://github.com/syncthing/syncthing/issues/9455 -Patch: 0001-lib-api-api_test-increase-timeout-from-1-second-to-6.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-rpm-macros @@ -41,6 +40,7 @@ Provides: bundled(angular-translate-loader-static-files) = 2.11.0 Provides: bundled(bootstrap) = 3.3.6 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.38.0 Provides: bundled(jquery-ui) = 1.12.1 @@ -52,60 +52,66 @@ Provides: bundled(moment) = 2.19.4 # 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)) = 754e693 # github.com/alecthomas/kong : MIT -Provides: bundled(golang(github.com/alecthomas/kong)) = 0.9.0 -# github.com/alexbrainman/sspi : BSD-3-Clause -Provides: bundled(golang(github.com/alexbrainman/sspi)) = 1a75b47 +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/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 +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.4 +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/v2)) = 2.3.0 # github.com/chmduquesne/rollinghash : MIT 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)) = 2.0.4 +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/davecgh/go-spew : ISC Provides: bundled(golang(github.com/davecgh/go-spew)) = 1.1.1 -# github.com/flynn-archive/go-shlex : Apache-2.0 -Provides: bundled(golang(github.com/flynn-archive/go-shlex)) = 3f9db97 +# 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.5 +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.4.6 -# github.com/go-logr/logr : Apache-2.0 -Provides: bundled(golang(github.com/go-logr/logr)) = 1.4.1 +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.3.0 # github.com/go-task/slim-sprig : MIT -Provides: bundled(golang(github.com/go-task/slim-sprig)) = 52ccab3 +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-3-Clause -Provides: bundled(golang(github.com/gogo/protobuf)) = 1.3.2 +# 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)) = 29b9bb0 +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.7.2 +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 @@ -113,39 +119,37 @@ 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.14 +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/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/klauspost/cpuid : MIT -Provides: bundled(golang(github.com/klauspost/cpuid/v2)) = 2.2.7 -# github.com/kr/text : MIT -Provides: bundled(golang(github.com/kr/text)) = 0.2.0 -# github.com/lib/pq : MIT -Provides: bundled(golang(github.com/lib/pq)) = 1.10.9 +# 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.3.1 +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.8.1 -# github.com/minio/sha256-simd : Apache-2.0 -Provides: bundled(golang(github.com/minio/sha256-simd)) = 1.0.1 +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.17.1 -# github.com/onsi/gomega : MIT -Provides: bundled(golang(github.com/onsi/gomega)) = 1.31.1 +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.9.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.12.0 +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.21 +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/pmezard/go-difflib : BSD-3-Clause @@ -155,35 +159,43 @@ 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.19.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.52.2 +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.13.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.42.0 +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)) = cf1acfc +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/v3)) = 3.24.3 +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.9.0 +Provides: bundled(golang(github.com/stretchr/testify)) = 1.10.0 # github.com/syncthing/notify : MIT -Provides: bundled(golang(github.com/syncthing/notify)) = c6b7342 +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.5 +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.14 +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 # github.com/willabides/kongplete : MIT @@ -191,31 +203,31 @@ 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.5.3 +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.4.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.22.0 -# golang.org/x/exp : BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = c0f41cb +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.17.0 +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.24.0 +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.7.0 +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.19.0 +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.14.0 +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.5.0 +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.20.0 +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.33.0 +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 @@ -227,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) @@ -304,7 +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 +%gobuild -o _bin/strelaypoolsrv %{goipath}/cmd/infra/strelaypoolsrv %install @@ -346,7 +341,6 @@ 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 @@ -354,10 +348,6 @@ for i in $(find -name "*.go" -type f -executable -print); do chmod a-x $i; done -%if %{with devel} -%goinstall -%endif - %check desktop-file-validate %{buildroot}/%{_datadir}/applications/*.desktop @@ -367,7 +357,7 @@ 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 @@ -445,7 +435,6 @@ export GO111MODULE=off %{_mandir}/*/syncthing* %{_unitdir}/syncthing@.service -%{_unitdir}/syncthing-resume.service %{_userunitdir}/syncthing.service @@ -461,12 +450,5 @@ export GO111MODULE=off %{_mandir}/man1/strelaysrv* -%if %{with devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md AUTHORS -%endif - - %changelog %autochangelog