diff --git a/.gitignore b/.gitignore index 44f176a..31ce566 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ /trayscale-0.12.6-vendored.tar.xz /trayscale-0.13.0-vendored.tar.xz /trayscale-0.13.1-vendored.tar.xz -/trayscale-0.14.0-vendored.tar.xz -/trayscale-0.14.1-vendored.tar.xz -/trayscale-0.18.0-vendored.tar.xz -/trayscale-0.18.1-vendored.tar.xz diff --git a/sources b/sources index ef33cba..c3512d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trayscale-0.18.1-vendored.tar.xz) = 8e6342536b6020c233e854328ba063c8f74c3c500124487177b9b3011e1eb16222293ae9daab131f704c99cfc21fad3ef772b675122266544a65defa7268aa2f +SHA512 (trayscale-0.13.1-vendored.tar.xz) = fdbd77a77870bf35f6b4de9c95692cead8cf84b7e4b741122422dc38d75b993930ab31dafb1d3d483706164f977391a9bc0019e05bc63795e74c56cf0a15b60c diff --git a/trayscale.spec b/trayscale.spec index ffa06a1..157d6be 100644 --- a/trayscale.spec +++ b/trayscale.spec @@ -9,7 +9,7 @@ # https://github.com/DeedleFake/trayscale %global goipath github.com/DeedleFake/trayscale -Version: 0.18.1 +Version: 0.13.1 %if 0%{?rhel} %gometa @@ -24,7 +24,7 @@ An unofficial GUI wrapper around the Tailscale CLI client.} %global godocs README.md Name: trayscale -Release: 3%{?dist} +Release: 1%{?dist} Summary: An unofficial GUI wrapper around the Tailscale CLI client # main source code is MIT @@ -33,7 +33,7 @@ License: MIT AND BSD-2-Clause AND Apache-2.0 AND MPL-2.0 AND ISC AND BSD- URL: %{gourl} # see create-vendor-tarball.sh in this distgit repo Source0: trayscale-%{version}-vendored.tar.xz -Source99: create-vendor-tarball.sh +Source1: create-vendor-tarball.sh BuildRequires: glib2-devel BuildRequires: gobject-introspection-devel @@ -51,8 +51,6 @@ Requires: hicolor-icon-theme # MIT Provides: bundled(golang(deedles.dev/mk)) = v0.1.0 -# MIT -Provides: bundled(golang(deedles.dev/xiter)) = v0.1.0 # Apache-2.0 Provides: bundled(golang(fyne.io/systray)) = v1.11.0 # MPL-2.0 @@ -62,31 +60,31 @@ Provides: bundled(golang(github.com/diamondburned/gotk4/pkg)) = v0.3.1 # BSD-3-Clause Provides: bundled(golang(github.com/inhies/go-bytesize)) = v0.0.0~20220417184213~4913239db9cf # BSD-3-Clause -Provides: bundled(golang(golang.org/x/net)) = v0.31.0 +Provides: bundled(golang(golang.org/x/net)) = v0.28.0 +# Apache-2.0 +Provides: bundled(golang(gotest.tools/v3)) = v3.5.1 # MIT OR BSD-3-Clause -Provides: bundled(golang(honnef.co/go/tools)) = v0.5.1 +Provides: bundled(golang(honnef.co/go/tools)) = v0.4.7 # BSD-3-Clause -Provides: bundled(golang(tailscale.com)) = v1.76.6 +Provides: bundled(golang(tailscale.com)) = v1.70.0 # BSD-3-Clause Provides: bundled(golang(filippo.io/edwards25519)) = v1.1.0 # MIT -Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.4.1~0.20240615085220~eb727477b3f7 +Provides: bundled(golang(github.com/BurntSushi/toml)) = v1.4.0 # MIT Provides: bundled(golang(github.com/KarpelesLab/weak)) = v0.1.1 # Apache-2.0 Provides: bundled(golang(github.com/akutz/memconn)) = v0.1.0 # BSD-3-Clause Provides: bundled(golang(github.com/alexbrainman/sspi)) = v0.0.0~20231016080023~1a75b4708caa -# ISC -Provides: bundled(golang(github.com/coder/websocket)) = v1.8.12 # Apache-2.0 -Provides: bundled(golang(github.com/coreos/go-iptables)) = v0.8.0 +Provides: bundled(golang(github.com/coreos/go-iptables)) = v0.7.1~0.20240112124308~65c67c9f46e6 # BSD-3-Clause -Provides: bundled(golang(github.com/dblohm7/wingoes)) = v0.0.0~20240820181039~f2b84150679e +Provides: bundled(golang(github.com/dblohm7/wingoes)) = v0.0.0~20240801171404~fc12d7c70140 # MIT Provides: bundled(golang(github.com/fxamacker/cbor/v2)) = v2.7.0 # BSD-3-Clause -Provides: bundled(golang(github.com/go-json-experiment/json)) = v0.0.0~20240815175050~ebd3a8989ca1 +Provides: bundled(golang(github.com/go-json-experiment/json)) = v0.0.0~20240524174822~2d9f40f7385b # BSD-2-Clause Provides: bundled(golang(github.com/godbus/dbus/v5)) = v5.1.1~0.20230522191255~76236955d466 # Apache-2.0 @@ -94,7 +92,7 @@ Provides: bundled(golang(github.com/golang/groupcache)) = v0.0.0~202103312 # BSD-3-Clause Provides: bundled(golang(github.com/google/go-cmp)) = v0.6.0 # Apache-2.0 -Provides: bundled(golang(github.com/google/nftables)) = v0.2.1~0.20240902164806~9a9f2ce6b319 +Provides: bundled(golang(github.com/google/nftables)) = v0.2.1~0.20240414091927~5e242ec57806 # BSD-3-Clause Provides: bundled(golang(github.com/google/uuid)) = v1.6.0 # BSD-3-Clause @@ -118,7 +116,7 @@ Provides: bundled(golang(github.com/mdlayher/netlink)) = v1.7.2 # MIT Provides: bundled(golang(github.com/mdlayher/socket)) = v0.5.1 # BSD-3-Clause -Provides: bundled(golang(github.com/miekg/dns)) = v1.1.62 +Provides: bundled(golang(github.com/miekg/dns)) = v1.1.61 # MIT Provides: bundled(golang(github.com/mitchellh/go-ps)) = v1.0.0 # Apache-2.0 @@ -128,9 +126,9 @@ Provides: bundled(golang(github.com/skip2/go-qrcode)) = v0.0.0~20200617195 # MIT Provides: bundled(golang(github.com/tailscale/go-winio)) = v0.0.0~20231025203758~c4f33415bf55 # BSD-2-Clause -Provides: bundled(golang(github.com/tailscale/goupnp)) = v1.0.1~0.20210804030727~66b27ba4e403 +Provides: bundled(golang(github.com/tailscale/goupnp)) = v1.0.1~0.20210804011211~c64d0f06ea05 # Apache-2.0 -Provides: bundled(golang(github.com/tailscale/netlink)) = v1.1.1~0.20240822203006~4d49adab4de7 +Provides: bundled(golang(github.com/tailscale/netlink)) = v1.1.1~0.20211101221916~cabfb018fe85 # BSD-3-Clause Provides: bundled(golang(github.com/tailscale/web-client-prebuilt)) = v0.0.0~20240226180453~5db17b287bf1 # MIT @@ -138,7 +136,9 @@ Provides: bundled(golang(github.com/tcnksm/go-httpstat)) = v0.2.0 # MIT Provides: bundled(golang(github.com/toqueteos/webbrowser)) = v1.2.0 # Apache-2.0 -Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.5 +Provides: bundled(golang(github.com/vishvananda/netlink)) = v1.2.1~beta.2 +# Apache-2.0 +Provides: bundled(golang(github.com/vishvananda/netns)) = v0.0.4 # MIT Provides: bundled(golang(github.com/x448/float16)) = v0.8.4 # Apache-2.0 @@ -148,33 +148,35 @@ Provides: bundled(golang(go4.org/netipx)) = v0.0.0~20231129151722~fdeea329 # BSD-3-Clause Provides: bundled(golang(go4.org/unsafe/assume-no-moving-gc)) = v0.0.0~20231121144256~b99613f794b6 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/crypto)) = v0.29.0 +Provides: bundled(golang(golang.org/x/crypto)) = v0.26.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp)) = v0.0.0~20241108190413~2d47ceb2692f +Provides: bundled(golang(golang.org/x/exp)) = v0.0.0~20240808152545~0cdaa3abc0fa # BSD-3-Clause -Provides: bundled(golang(golang.org/x/exp/typeparams)) = v0.0.0~20241108190413~2d47ceb2692f +Provides: bundled(golang(golang.org/x/exp/typeparams)) = v0.0.0~20240808152545~0cdaa3abc0fa # BSD-3-Clause -Provides: bundled(golang(golang.org/x/mod)) = v0.22.0 +Provides: bundled(golang(golang.org/x/mod)) = v0.20.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/oauth2)) = v0.24.0 +Provides: bundled(golang(golang.org/x/oauth2)) = v0.22.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/sync)) = v0.9.0 +Provides: bundled(golang(golang.org/x/sync)) = v0.8.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/sys)) = v0.27.0 +Provides: bundled(golang(golang.org/x/sys)) = v0.24.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/text)) = v0.20.0 +Provides: bundled(golang(golang.org/x/text)) = v0.17.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/time)) = v0.8.0 +Provides: bundled(golang(golang.org/x/time)) = v0.6.0 # BSD-3-Clause -Provides: bundled(golang(golang.org/x/tools)) = v0.27.0 +Provides: bundled(golang(golang.org/x/tools)) = v0.24.0 # MIT Provides: bundled(golang(golang.zx2c4.com/wireguard/windows)) = v0.5.3 # Apache-2.0 -Provides: bundled(golang(k8s.io/client-go)) = v0.31.2 +Provides: bundled(golang(k8s.io/client-go)) = v0.30.3 +# ISC +Provides: bundled(golang(nhooyr.io/websocket)) = v1.8.17 # MIT OR BSD-3-Clause OR Apache-2.0 Provides: bundled(golang(sigs.k8s.io/yaml)) = v1.4.0 # BSD-3-Clause -Provides: bundled(golang(software.sslmate.com/src/go-pkcs12)) = v0.5.0 +Provides: bundled(golang(software.sslmate.com/src/go-pkcs12)) = v0.4.0 %description %{common_description} @@ -189,10 +191,10 @@ rm -rf vendor/ %endif %goprep %{?with_vendor:-k} +%autopatch -p1 %build -export LDFLAGS="-X 'github.com/DeedleFake/trayscale/version=%{version}'" %gobuild -o trayscale ./cmd/trayscale @@ -204,7 +206,6 @@ install -D -t %{buildroot}%{_bindir} trayscale install -Dm644 -t %{buildroot}%{_datadir}/applications dev.deedles.Trayscale.desktop install -Dm644 -t %{buildroot}%{_datadir}/icons/hicolor/256x256/apps dev.deedles.Trayscale.png install -Dm644 -t %{buildroot}%{_metainfodir} dev.deedles.Trayscale.metainfo.xml -install -Dm644 -t %{buildroot}%{_datadir}/glib-2.0/schemas dev.deedles.Trayscale.gschema.xml %endif @@ -221,7 +222,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/dev.deedles.Tr %doc README.md %{_bindir}/trayscale %{_datadir}/applications/dev.deedles.Trayscale.desktop -%{_datadir}/glib-2.0/schemas/dev.deedles.Trayscale.gschema.xml %{_datadir}/icons/hicolor/*/apps/dev.deedles.Trayscale.png %{_metainfodir}/dev.deedles.Trayscale.metainfo.xml @@ -232,34 +232,6 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/dev.deedles.Tr %changelog -* Fri Oct 10 2025 Alejandro Sáez - 0.18.1-3 -- rebuild - -* Fri Aug 15 2025 Maxwell G - 0.18.1-2 -- Rebuild for golang-1.25.0 - -* Tue Jul 29 2025 Jonathan Wright - 0.18.1-1 -- update to 0.18.1 rhbz#2384201 -- Include preference gschema rhbz#2343982 - -* Fri Jul 25 2025 Fedora Release Engineering - 0.18.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Thu Jun 05 2025 Jonathan Wright - 0.18.0-1 -- update to 0.18.0 rhbz#2345463 - -* Fri Feb 21 2025 Jonathan Wright - 0.14.1-3 -- Fix version output on About page - -* Sun Jan 19 2025 Fedora Release Engineering - 0.14.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Jan 03 2025 Jonathan Wright - 0.14.1-1 -- update to 0.14.1 rhbz#2333617 - -* Fri Nov 22 2024 Jonathan Wright - 0.14.0-1 -- update to 0.14.0 rhbz#2305263 - * Mon Aug 12 2024 Jonathan Wright - 0.13.1-1 - update to 1.13.1 rhbz#2304060