From 94cfe6f56f3d71d1437b2cb3a67b9b43206756a4 Mon Sep 17 00:00:00 2001 From: panchenbo Date: Thu, 18 Feb 2021 11:26:09 +0800 Subject: [PATCH] fix build error (cherry picked from commit 914427cbc49eadb89afe2895fa6b26d43790511c) --- dde-api.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/dde-api.spec b/dde-api.spec index cc5e0b5..a864bef 100755 --- a/dde-api.spec +++ b/dde-api.spec @@ -15,11 +15,10 @@ %global goipath pkg.deepin.io/dde/api %global forgeurl https://github.com/linuxdeepin/dde-api %global tag %{version} -%gometa Name: dde-api Version: 5.1.11.1 -Release: 6 +Release: 7 Summary: Go-lang bingding for dde-daemon License: GPLv3+ URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/ @@ -59,7 +58,6 @@ sed -i 's|PREFIX}${libdir|LIBDIR|; s|libdir|LIBDIR|' \ Makefile adjust-grub-theme/main.go %build -%gobuildroot for cmd in $(make binaries); do GOPATH=%{_builddir}/%{name}-%{version}-%{release_name}/vendor go build -mod=vendor -o _bin/$cmd %{goipath}/$cmd @@ -69,7 +67,10 @@ done %install rm -rf $(make binaries) gofiles=$(find $(make libraries) %{?gofindfilter} -print) -%goinstall $gofiles +for file in $gofiles ; do + install -d -p %{buildroot}/%{gopath}/src/%{goipath}/$(dirname $file) + cp -pav $file %{buildroot}/%{gopath}/src/%{goipath}/$file +done %make_install SYSTEMD_SERVICE_DIR="%{_unitdir}" LIBDIR="%{_libexecdir}" # HOME directory for user deepin-sound-player mkdir -p %{buildroot}%{_sharedstatedir}/deepin-sound-player @@ -114,9 +115,11 @@ exit 0 %{_datadir}/polkit-1/actions/com.deepin.api.device.unblock-bluetooth-devices.policy %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla %attr(-, deepin-sound-player, deepin-sound-player) %{_sharedstatedir}/deepin-sound-player -%exclude /usr/share/gocode/src +%exclude %{gopath}/src %changelog +* Thu Feb 18 2021 panchenbo - 5.1.11.1-7 +- fix build error * Thu Sep 3 2020 weidong - 5.1.11.1-6 - fix source url in spec * Wed Sep 2 2020 chenbo pan - 5.1.11.1-5 -- Gitee