diff --git a/.gitignore b/.gitignore index 89682a9..6cb04b7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /clash-1.5.0.tar.gz /clash-1.6.0.tar.gz /clash-1.6.5.tar.gz +/clash-1.8.0.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..7016d9c --- /dev/null +++ b/changelog @@ -0,0 +1,37 @@ +* Wed Jul 21 2021 Fedora Release Engineering - 1.6.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Sat Jul 03 2021 Fedora Release Monitoring - 1.6.5-1 +- Update to 1.6.5 (#1978923) + +* Sat Jun 12 2021 Qiyu Yan - 1.6.0-1 +- Update to 1.6.0 upstream release + +* Sat Apr 10 2021 Qiyu Yan - 1.5.0-1 +- Update to 1.5.0 upstream release + +* Sat Mar 20 2021 Qiyu Yan - 1.4.2-1 +- Update to 1.4.2 upstream release + +* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2.0-3 +- Rebuilt for updated systemd-rpm-macros + See https://pagure.io/fesco/issue/2583. + +* Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Oct 09 2020 Qiyu Yan - 1.2.0-1 +- update to 1.2.0 upstream release + +* Tue Aug 18 2020 Qiyu Yan - 1.1.0-1 +- update to 1.1.0 upstream release + +* Sat Aug 01 2020 Qiyu Yan - 1.0.0-4 +- Change systemd scriptlets + +* Mon Jul 27 2020 Qiyu Yan - 1.0.0-3 +- don't use go mod + +* Mon Jul 27 2020 Qiyu Yan - 1.0.0-2 +- Add unit files, taken from +- https://github.com/archlinux/svntogit-community/tree/packages/clash/trunk \ No newline at end of file diff --git a/clash.spec b/clash.spec index a1e6ff0..822c5b7 100644 --- a/clash.spec +++ b/clash.spec @@ -4,7 +4,7 @@ # https://github.com/Dreamacro/clash %global goipath github.com/Dreamacro/clash -Version: 1.6.5 +Version: 1.8.0 %gometa @@ -15,7 +15,7 @@ A rule-based tunnel in Go.} %global godocs docs README.md Name: clash -Release: 2%{?dist} +Release: %autorelease Summary: A rule-based tunnel in Go License: GPLv3 @@ -25,29 +25,40 @@ Source1: clash.service Source2: clash@.service BuildRequires: systemd-rpm-macros + BuildRequires: golang(github.com/Dreamacro/go-shadowsocks2/core) BuildRequires: golang(github.com/Dreamacro/go-shadowsocks2/shadowaead) -BuildRequires: golang(github.com/go-chi/chi) +BuildRequires: golang(github.com/Dreamacro/go-shadowsocks2/shadowstream) +BuildRequires: golang(github.com/go-chi/chi/v5) BuildRequires: golang(github.com/go-chi/cors) BuildRequires: golang(github.com/go-chi/render) BuildRequires: golang(github.com/gofrs/uuid) BuildRequires: golang(github.com/gorilla/websocket) +BuildRequires: golang(github.com/insomniacslk/dhcp/dhcpv4) BuildRequires: golang(github.com/miekg/dns) BuildRequires: golang(github.com/oschwald/geoip2-golang) BuildRequires: golang(github.com/sirupsen/logrus) +BuildRequires: golang(go.etcd.io/bbolt) +BuildRequires: golang(go.uber.org/atomic) +BuildRequires: golang(go.uber.org/automaxprocs/maxprocs) BuildRequires: golang(golang.org/x/crypto/argon2) BuildRequires: golang(golang.org/x/crypto/chacha20poly1305) +BuildRequires: golang(golang.org/x/net/http2) BuildRequires: golang(golang.org/x/net/publicsuffix) BuildRequires: golang(golang.org/x/sync/singleflight) -BuildRequires: golang(gopkg.in/eapache/channels.v1) +BuildRequires: golang(golang.org/x/sys/unix) BuildRequires: golang(gopkg.in/yaml.v2) -BuildRequires: golang(go.uber.org/atomic) %if %{with check} # Tests +BuildRequires: golang(github.com/docker/docker/api/types) +BuildRequires: golang(github.com/docker/docker/api/types/container) +BuildRequires: golang(github.com/docker/docker/client) +BuildRequires: golang(github.com/docker/go-connections/nat) BuildRequires: golang(github.com/stretchr/testify/assert) %endif + %description %{common_description} @@ -75,7 +86,11 @@ install -m 0755 -vp %{S:2} %{buildroot}%{_unitdir}/ %if %{with check} %check -%gocheck +# some ckecks needs docker daemon and networking +# so we need to ignore the result of tests +# but we can leave the left part running to see +# the results. +%gocheck ||: %endif %post @@ -104,41 +119,5 @@ fi %gopkgfiles %changelog -* Wed Jul 21 2021 Fedora Release Engineering - 1.6.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 03 2021 Fedora Release Monitoring - 1.6.5-1 -- Update to 1.6.5 (#1978923) - -* Sat Jun 12 2021 Qiyu Yan - 1.6.0-1 -- Update to 1.6.0 upstream release - -* Sat Apr 10 2021 Qiyu Yan - 1.5.0-1 -- Update to 1.5.0 upstream release - -* Sat Mar 20 2021 Qiyu Yan - 1.4.2-1 -- Update to 1.4.2 upstream release - -* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 1.2.0-3 -- Rebuilt for updated systemd-rpm-macros - See https://pagure.io/fesco/issue/2583. - -* Tue Jan 26 2021 Fedora Release Engineering - 1.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Oct 09 2020 Qiyu Yan - 1.2.0-1 -- update to 1.2.0 upstream release - -* Tue Aug 18 2020 Qiyu Yan - 1.1.0-1 -- update to 1.1.0 upstream release - -* Sat Aug 01 2020 Qiyu Yan - 1.0.0-4 -- Change systemd scriptlets - -* Mon Jul 27 2020 Qiyu Yan - 1.0.0-3 -- don't use go mod - -* Mon Jul 27 2020 Qiyu Yan - 1.0.0-2 -- Add unit files, taken from -- https://github.com/archlinux/svntogit-community/tree/packages/clash/trunk +%autochangelog diff --git a/sources b/sources index 9077aff..55fda9d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (clash-1.6.5.tar.gz) = be5c08771ba1e4385649925981c5e9265c719b77a3932c6e224ce1b4269aaca9f25af32e0bcd9c1fb4f430c309dfbaa9355f18fed0c105b6e0bc3e5260d89921 +SHA512 (clash-1.8.0.tar.gz) = 7da78efaad5f18905bf3be719172cf6270de21c0dfe81fb1d0b918e3c35bf3433595467a3fb28e4d6508b7fa027a18fa2a1356aa0aaa0bef26aaee04ba61aee6