diff options
| author | Andrei Belov <defan@nginx.com> | 2019-12-26 17:52:09 +0300 |
|---|---|---|
| committer | Andrei Belov <defan@nginx.com> | 2019-12-26 17:52:09 +0300 |
| commit | 35ff5ee1e82a03e57d625230173a84c829c13257 (patch) | |
| tree | c3dce5e8d50c8da9739f23b41a636931ad562e25 /pkg/rpm/Makefile.go | |
| parent | 0ec222bbb202194327c2e76d48f0b2608b37c162 (diff) | |
| parent | 55f8e31ed70910ef07db31d7f3c53b12774180f9 (diff) | |
| download | unit-35ff5ee1e82a03e57d625230173a84c829c13257.tar.gz unit-35ff5ee1e82a03e57d625230173a84c829c13257.tar.bz2 | |
Merged with the default branch.1.14.0-1
Diffstat (limited to 'pkg/rpm/Makefile.go')
| -rw-r--r-- | pkg/rpm/Makefile.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/pkg/rpm/Makefile.go b/pkg/rpm/Makefile.go index 09dffd21..e3891ab4 100644 --- a/pkg/rpm/Makefile.go +++ b/pkg/rpm/Makefile.go @@ -8,7 +8,7 @@ MODULE_RELEASE_go= 1 MODULE_CONFARGS_go= go --go-path=%{gopath} MODULE_MAKEARGS_go= go -MODULE_INSTARGS_go= go-install +MODULE_INSTARGS_go= go-install-src MODULE_SOURCES_go= unit.example-go-app \ unit.example-go-config @@ -25,11 +25,15 @@ BUILD_DEPENDS+= $(BUILD_DEPENDS_go) ifneq (,$(findstring $(OSVER),opensuse-leap opensuse-tumbleweed)) define MODULE_DEFINITIONS_go +BuildArch: noarch +Requires: unit-devel == $(VERSION)-$(RELEASE)%{?dist}.ngx BuildRequires: $(BUILD_DEPENDS_go) %define gopath /usr/share/go/contrib endef else define MODULE_DEFINITIONS_go +BuildArch: noarch +Requires: unit-devel == $(VERSION)-$(RELEASE)%{?dist}.ngx BuildRequires: $(BUILD_DEPENDS_go) endef endif @@ -48,8 +52,8 @@ endef export MODULE_PREINSTALL_go define MODULE_FILES_go -%dir %{gopath}/src/nginx/unit -%{gopath}/src/nginx/unit/* +%dir %{gopath}/src/unit.nginx.org/go +%{gopath}/src/unit.nginx.org/go/* endef export MODULE_FILES_go |