From efeed6fe48328fd4178a8082e1882d32ad031aff Mon Sep 17 00:00:00 2001 From: panchenbo Date: Thu, 18 Feb 2021 11:38:55 +0800 Subject: [PATCH 1/2] fix build error --- dde-api.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dde-api.spec b/dde-api.spec index cc5e0b5..e5b2232 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/ @@ -30,7 +29,7 @@ BuildRequires: libcanberra-devel BuildRequires: deepin-gettext-tools BuildRequires: librsvg2-devel BuildRequires: sqlite-devel -BuildRequires: compiler(go-compiler) +BuildRequires: golang BuildRequires: gdk-pixbuf2-xlib-devel BuildRequires: kf5-kwayland-devel BuildRequires: poppler-glib @@ -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 From 20635f4e5caa06db58aaf2deef5c3bc42e339de4 Mon Sep 17 00:00:00 2001 From: weidong Date: Thu, 4 Mar 2021 14:53:20 +0800 Subject: [PATCH 2/2] Update license --- dde-api.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dde-api.spec b/dde-api.spec index e5b2232..f43d5c9 100755 --- a/dde-api.spec +++ b/dde-api.spec @@ -18,9 +18,9 @@ Name: dde-api Version: 5.1.11.1 -Release: 7 +Release: 8 Summary: Go-lang bingding for dde-daemon -License: GPLv3+ +License: GPLv2 URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/ Source0: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/%{name}_%{version}-%{release_name}.orig.tar.xz Patch1: deepin-api_makefile.patch @@ -118,6 +118,9 @@ exit 0 %exclude %{gopath}/src %changelog +* Thu Mar 4 2021 weidong - 5.1.11.1-8 +- Update license. + * Thu Feb 18 2021 panchenbo - 5.1.11.1-7 - fix build error * Thu Sep 3 2020 weidong - 5.1.11.1-6 -- Gitee