packages/dde-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!10 fix build error

Browse Source 
From: @panchenbo
Reviewed-by: @yeqinglong01
Signed-off-by: @yeqinglong01
This commit is contained in:
openeuler-ci-bot 2021-02-18 13:11:22 +08:00 committed by Gitee
commit 6b027fdb5b
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dde-api.spec
View File

@ -15,11 +15,10 @@
%global goipath pkg.deepin.io/dde/api %global goipath pkg.deepin.io/dde/api
%global forgeurl https://github.com/linuxdeepin/dde-api %global forgeurl https://github.com/linuxdeepin/dde-api
%global tag %{version} %global tag %{version}
%gometa
Name: dde-api Name: dde-api
Version: 5.1.11.1 Version: 5.1.11.1
Release: 6 Release: 7
Summary: Go-lang bingding for dde-daemon Summary: Go-lang bingding for dde-daemon
License: GPLv3+ License: GPLv3+
URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/ URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/
@ -30,7 +29,7 @@ BuildRequires: libcanberra-devel
BuildRequires: deepin-gettext-tools BuildRequires: deepin-gettext-tools
BuildRequires: librsvg2-devel BuildRequires: librsvg2-devel
BuildRequires: sqlite-devel BuildRequires: sqlite-devel
BuildRequires: compiler(go-compiler) BuildRequires: golang
BuildRequires: gdk-pixbuf2-xlib-devel BuildRequires: gdk-pixbuf2-xlib-devel
BuildRequires: kf5-kwayland-devel BuildRequires: kf5-kwayland-devel
BuildRequires: poppler-glib BuildRequires: poppler-glib
@ -59,7 +58,6 @@ sed -i 's|PREFIX}${libdir|LIBDIR|; s|libdir|LIBDIR|' \
Makefile adjust-grub-theme/main.go Makefile adjust-grub-theme/main.go
%build %build
%gobuildroot
for cmd in $(make binaries); do for cmd in $(make binaries); do
GOPATH=%{_builddir}/%{name}-%{version}-%{release_name}/vendor GOPATH=%{_builddir}/%{name}-%{version}-%{release_name}/vendor
go build -mod=vendor -o _bin/$cmd %{goipath}/$cmd go build -mod=vendor -o _bin/$cmd %{goipath}/$cmd
@ -69,7 +67,10 @@ done
%install %install
rm -rf $(make binaries) rm -rf $(make binaries)
gofiles=$(find $(make libraries) %{?gofindfilter} -print) 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}" %make_install SYSTEMD_SERVICE_DIR="%{_unitdir}" LIBDIR="%{_libexecdir}"
# HOME directory for user deepin-sound-player # HOME directory for user deepin-sound-player
mkdir -p %{buildroot}%{_sharedstatedir}/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 %{_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 %{_var}/lib/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla
%attr(-, deepin-sound-player, deepin-sound-player) %{_sharedstatedir}/deepin-sound-player %attr(-, deepin-sound-player, deepin-sound-player) %{_sharedstatedir}/deepin-sound-player
%exclude /usr/share/gocode/src %exclude %{gopath}/src
%changelog %changelog
* Thu Feb 18 2021 panchenbo <panchenbo@uniontech.com> - 5.1.11.1-7
- fix build error
* Thu Sep 3 2020 weidong <weidong@uniontech.com> - 5.1.11.1-6 * Thu Sep 3 2020 weidong <weidong@uniontech.com> - 5.1.11.1-6
- fix source url in spec - fix source url in spec
* Wed Sep 2 2020 chenbo pan <panchenbo@uniontech.com> - 5.1.11.1-5 * Wed Sep 2 2020 chenbo pan <panchenbo@uniontech.com> - 5.1.11.1-5