diff --git a/dde-api.spec b/dde-api.spec index 26df16f..53217fe 100755 --- a/dde-api.spec +++ b/dde-api.spec @@ -30,7 +30,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 @@ -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 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 0b89bfa..fd242ef 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 975c36d..12987ac 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 \