diff --git a/Makefile b/Makefile index 487c5a8..d992f9d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ NAME = netoik-git VERSION = $(shell git describe --abbrev=0) RELEASE = $(shell git rev-parse --short HEAD) REFERENCE = $(if $(GIT_REFERENCE),$(GIT_REFERENCE),$(shell git branch --show-current)) -BUILD_ARCH = noarch +ARCH = noarch RPM_RPMDIR = $(shell rpm --eval '%{_rpmdir}') RPM_SBINDIR = $(shell rpm --eval '%{_sbindir}') @@ -11,7 +11,7 @@ RPM_SHAREDSTATEDIR = $(shell rpm --eval '%{_sharedstatedir}') RPM_SYSCONFDIR = $(shell rpm --eval '%{_sysconfdir}') RPM_UNITDIR = $(shell rpm --eval '%{_unitdir}') -RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION).tar.gz +RPM_TARBALL_PATH = $(RPM_SOURCEDIR)/$(NAME)-$(VERSION)-$(RELEASE).tar.gz RPM_BUILD_PATH = $(RPM_RPMDIR)/$(BUILD_ARCH)/$(NAME)-$(VERSION)-$(RELEASE).$(BUILD_ARCH).rpm .PHONY: name @@ -26,14 +26,14 @@ version: release: @echo "$(RELEASE)" -.PHONY: build_arch -build_arch: - @echo "$(BUILD_ARCH)" +.PHONY: arch +arch: + @echo "$(ARCH)" .PHONY: install install: install --mode=755 --directory $(DESTDIR)$(RPM_SYSCONFDIR)/gitea $(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d $(DESTDIR)$(RPM_UNITDIR) $(DESTDIR)$(RPM_SHAREDSTATEDIR)/actrunners - install --mode=644 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d/ git.netoik.io.conf + install --mode=644 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/nginx/conf.d/ files/nginx/git.netoik.io.conf install --mode=640 --target-directory=$(DESTDIR)$(RPM_SYSCONFDIR)/gitea files/gitea/app.ini install --mode=644 --target-directory=$(DESTDIR)$(RPM_UNITDIR) files/systemd/gitea.service files/systemd/actrunner@.service diff --git a/netoik-git.spec b/netoik-git.spec index d09c8dd..d0e542c 100644 --- a/netoik-git.spec +++ b/netoik-git.spec @@ -7,8 +7,8 @@ Summary: Netoik Reverse Proxy License: MIT URL: https://git.netoik.io/samuel/%(make name) -Source0: %{name}-%{version}.tar.gz -Buildarch: %(make build_arch) +Source0: %{name}-%{version}-%{release}.tar.gz +Buildarch: %(make arch) BuildRequires: make Requires: netoik-rp netoik-db netoik-cache git