diff --git a/dde-api.spec b/dde-api.spec index cb1a54f7f411cf5f052ef89e27de1e57d829ee4d..26df16f27c509a00a33a55a3ba0bcc9bd072722f 100755 --- a/dde-api.spec +++ b/dde-api.spec @@ -19,7 +19,7 @@ Name: dde-api Version: 5.1.11.1 -Release: 2 +Release: 3 Summary: Go-lang bingding for dde-daemon License: GPLv3+ URL: https://shuttle.corp.deepin.com/cache/tasks/19177/unstable-amd64/ @@ -27,32 +27,17 @@ Source0: %{name}_%{version}-%{release_name}.orig.tar.xz Patch1: deepin-api_makefile.patch BuildRequires: libcanberra-devel -BuildRequires: go-lib-devel BuildRequires: deepin-gettext-tools -BuildRequires: deepin-gir-generator BuildRequires: librsvg2-devel BuildRequires: sqlite-devel BuildRequires: compiler(go-compiler) -BuildRequires: golang-github-linuxdeepin-go-x11-client-devel BuildRequires: gdk-pixbuf2-xlib-devel BuildRequires: kf5-kwayland-devel -BuildRequires: golang-github-linuxdeepin-go-dbus-factory-devel -BuildRequires: golang-github-mattn-go-sqlite3-devel -BuildRequires: golang-gopkg-alecthomas-kingpin-devel -BuildRequires: golang-github-alecthomas-template-devel -BuildRequires: golang-github-alecthomas-units-devel BuildRequires: poppler-glib BuildRequires: poppler-glib-devel -BuildRequires: golang-github-cryptix-wav-devel BuildRequires: alsa-lib-devel BuildRequires: alsa-lib BuildRequires: pulseaudio-libs-devel -BuildRequires: golang-github-disintegration-imaging-devel -BuildRequires: golang-github-fogleman-gg-devel -BuildRequires: golang-github-golang-freetype-devel -BuildRequires: golang.org-x-image-devel -BuildRequires: golang-golang-org-net-devel -BuildRequires: golang-github-rickb777-date-devel %{?systemd_requires} Requires: deepin-desktop-base Requires: rfkill @@ -85,9 +70,9 @@ sed -i 's|PREFIX}${libdir|LIBDIR|; s|libdir|LIBDIR|' \ Makefile adjust-grub-theme/main.go %build -export GOPATH=/usr/share/gocode:$GOPATH %gobuildroot for cmd in $(make binaries); do + GOPATH=/usr/share/gocode:%{_builddir}/%{name}-%{version}-%{release_name}/vendor:$GOPATH %gobuild -o _bin/$cmd %{goipath}/$cmd done %make_build @@ -144,6 +129,8 @@ exit 0 %files -n %{name}-devel -f devel.file-list %changelog +* 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 - fix spec * Thu Jul 30 2020 openEuler Buildteam - 5.1.11.1-1 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 19c37bebe59b719ec2c36ab3157b97f43230c685..0b89bfa6b4b1f1859e87f66c8019fb3f9bd70e35 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-deps-from-golang-x-image-patch.tar.gz b/deepin-api-deps-from-golang-x-image-patch.tar.gz deleted file mode 100644 index 4632262d408933fc931a457a48d39b3f248b2c2e..0000000000000000000000000000000000000000 Binary files a/deepin-api-deps-from-golang-x-image-patch.tar.gz and /dev/null differ