diff --git a/deepin-network-proxy-1.1.0.9.tar.gz b/deepin-network-proxy-1.1.0.9.tar.gz deleted file mode 100644 index 4600a95..0000000 Binary files a/deepin-network-proxy-1.1.0.9.tar.gz and /dev/null differ diff --git a/deepin-proxy-1.0.1.orig.tar.xz b/deepin-proxy-1.0.1.orig.tar.xz new file mode 100644 index 0000000..70de730 Binary files /dev/null and b/deepin-proxy-1.0.1.orig.tar.xz differ diff --git a/deepin-proxy.spec b/deepin-proxy.spec index aeb629f..08dd4b8 100644 --- a/deepin-proxy.spec +++ b/deepin-proxy.spec @@ -1,39 +1,51 @@ %global debug_package %{nil} -%global repo deepin-network-proxy Name: deepin-proxy -Version: 1.1.0.9 +Version: 1.0.1 Release: 1 Summary: Most simple RPM package License: GPLv3 -URL: https://github.com/linuxdeepin/%{repo} -Source0: %{repo}-%{version}.tar.gz -Source1: vendor.tar.gz +Source0: %{name}-%{version}.orig.tar.xz -BuildRequires: golang +BuildRequires: compiler(go-compiler) BuildRequires: pkgconfig(gdk-3.0) BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gobject-2.0) +%if 0%{?openeuler} +BuildRequires: gocode +%else +BuildRequires: golang-dbus +BuildRequires: golang-x-sys-devel +BuildRequires: golang-gopkg-yaml-devel-v2 +BuildRequires: golang-github-fsnotify-fsnotify-devel +BuildRequires: golang(gir/gio-2.0) +BuildRequires: golang(gir/glib-2.0) +BuildRequires: golang(gir/gobject-2.0) +BuildRequires: golang(gir/gudev-1.0) +BuildRequires: golang-github-stretchr-testify-devel BuildRequires: gtest-devel -Obsoletes: deepin-network-proxy +%endif +BuildRequires: golang-github-linuxdeepin-go-x11-client-devel +BuildRequires: golang-github-linuxdeepin-go-dbus-factory-devel +BuildRequires: go-lib-devel +BuildRequires: go-gir-generator +Obsoletes: deepin-network-proxy %description This is my first RPM package, which does nothing. %prep -%autosetup -n %{repo}-%{version} +%autosetup patch -p1 < rpm/lib-to-libexec.patch -tar -xf %{SOURCE1} - %build %ifarch loongarch64 export CGO_ENABLED=1 export GOOS=linux %endif -sed -i 's|gocode$|gocode:%{_builddir}/%{repo}-%{version}/vendor:|' Makefile +export GOPATH=/usr/share/gocode %make_build GO_BUILD_FLAGS=-trimpath %install @@ -46,5 +58,8 @@ sed -i 's|gocode$|gocode:%{_builddir}/%{repo}-%{version}/vendor:|' Makefile %{_libexecdir}/deepin-daemon/* %changelog +* Fri Dec 01 2023 lvgenggeng - 1.0.1-1 +- rebase to 1.0.1 + * Mon Aug 14 2023 leeffo - 1.1.0.9-1 - init package diff --git a/vendor.tar.gz b/vendor.tar.gz deleted file mode 100644 index 6b45a62..0000000 Binary files a/vendor.tar.gz and /dev/null differ