diff --git a/dde-api.spec b/dde-api.spec index 26df16f27c509a00a33a55a3ba0bcc9bd072722f..f150033b1012c76542825ee44d61eb90373786ee 100755 --- a/dde-api.spec +++ b/dde-api.spec @@ -19,7 +19,7 @@ Name: dde-api Version: 5.1.11.1 -Release: 3 +Release: 4 Summary: Go-lang bingding for dde-daemon License: GPLv3+ URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/ @@ -73,7 +73,7 @@ sed -i 's|PREFIX}${libdir|LIBDIR|; s|libdir|LIBDIR|' \ %gobuildroot for cmd in $(make binaries); do GOPATH=/usr/share/gocode:%{_builddir}/%{name}-%{version}-%{release_name}/vendor:$GOPATH - %gobuild -o _bin/$cmd %{goipath}/$cmd + go build -mod=vendor -o _bin/$cmd %{goipath}/$cmd done %make_build @@ -129,6 +129,8 @@ exit 0 %files -n %{name}-devel -f devel.file-list %changelog +* Wed Sep 2 2020 chenbo pan - 5.1.11.1-4 +- remove install golang devel * Tue Aug 18 2020 chenbo pan - 5.1.11.1-3 - remove golang devel * Thu Jul 30 2020 openEuler Buildteam - 5.1.11.1-2 diff --git a/dde-api_5.1.11.1-server-industry.orig.tar.xz b/dde-api_5.1.11.1-server-industry.orig.tar.xz index 0b89bfa6b4b1f1859e87f66c8019fb3f9bd70e35..fd242efe9c1a7ab91ee8f1c7866599135ac08a80 100755 Binary files a/dde-api_5.1.11.1-server-industry.orig.tar.xz and b/dde-api_5.1.11.1-server-industry.orig.tar.xz differ diff --git a/deepin-api_makefile.patch b/deepin-api_makefile.patch index 975c36d1d831ada2c1c715e10b2534e447274b78..12987ac1dc7dd0da9938d7601dca978cd0128ee9 100644 --- a/deepin-api_makefile.patch +++ b/deepin-api_makefile.patch @@ -9,7 +9,7 @@ +LIBDIR = /lib +SYSTEMD_LIB_DIR = ${LIBDIR} SYSTEMD_SERVICE_DIR = ${SYSTEMD_LIB_DIR}/systemd/system/ - GOBUILD = env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go build + GOBUILD = env GOPATH="${CURDIR}/${GOBUILD_DIR}:${GOPATH}" go build -mod=vendor @@ -38,7 +38,7 @@ image-blur \