From 114bb17fe7b8445016ef7a18da2ac8de07db8961 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 16 Dec 2019 17:18:51 +1100 Subject: [PATCH] build: Improve building of RPM Signed-off-by: Martin Schwenke --- Makefile | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index ee82ac9..279eb00 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,10 @@ -version=$$(git describe | sed -e 's@autocluster-@@' -e 's@-@_@g') +version = $(shell git describe | sed -e 's|autocluster-||' -e 's|-|_|g') +rpm_top_dir = $(shell rpmbuild --showrc | \ + sed -n -e 's|^.*: _topdir[[:space:]]*||p') +rpm_dir = $(rpm_top_dir)/RPMS/noarch +tarball = autocluster-$(version).tar.gz +rpm = autocluster-$(version)-1.noarch.rpm + prefix = /usr/local datadir = ${prefix}/share/autocluster @@ -23,20 +29,25 @@ install: all debian/changelog: debian/changelog.in Makefile .git/refs/heads/master sed -e "s/@@DATE@@/$$(date '+%a, %e %b %Y %T %z')/" -e "s/@@VERSION@@/$(version)/" $< > $@ || rm -f $@ -autocluster.spec: autocluster.spec.in Makefile .git/refs/heads/master +autocluster.spec: autocluster.spec.in Makefile .git/refs/heads/master .git/refs/tags sed -e "s/@@VERSION@@/$(version)/" $< > $@ || rm -f $@ ChangeLog: .git/refs/heads/master git log > $@ || rm -f $@ -dist: $(genpkg) +dist: $(tarball) + +$(tarball): $(genpkg) t=autocluster-$(version) && \ git archive --prefix=$${t}/ HEAD > $${t}.tar && \ tar r --transform s@^@$${t}/@ -f $${t}.tar $(genpkg) && \ gzip -f $${t}.tar -rpm: dist - rpmbuild -tb autocluster-$(version).tar.gz +rpm: $(rpm) + +$(rpm): $(tarball) + rpmbuild -tb $(tarball) + mv $(rpm_dir)/$(rpm) $(rpm) clean: rm -f $(hacks) $(genpkg) -- 2.34.1