From f50aae333354f5f8bc0c7db331d7237fbc0a3d35 Mon Sep 17 00:00:00 2001
From: Kamil Páral <kparal@redhat.com>
Date: Nov 15 2017 14:35:02 +0000
Subject: Makefile: fix building for releases with after-disttag suffix


The script failed if you wanted to build NVR, where R was e.g.
1.fc26.test1. This should fix it.

---

diff --git a/Makefile b/Makefile
index 3c2aaf7..9811f89 100644
--- a/Makefile
+++ b/Makefile
@@ -22,15 +22,14 @@ SRC=taskotron-trigger
 MODULENAME=jobtriggers
 
 # Variables used for packaging
+TARGETDIST:=.fc26
+BUILDTARGET=fedora-26-x86_64
 SPECFILE=$(SRC).spec
 BASEARCH:=$(shell uname -i)
-DIST:=$(shell rpm --eval '%{dist}')
-VERSION:=$(shell rpmspec -q --queryformat="%{VERSION}\n" $(SPECFILE) | uniq)
-RELEASE:=$(subst $(DIST),,$(shell rpmspec -q --queryformat="%{RELEASE}\n" $(SPECFILE) | uniq))
+VERSION:=$(shell rpm -q --queryformat="%{VERSION}\n" --specfile $(SPECFILE) | uniq)
+RELEASE:=$(shell rpm -q --queryformat="%{RELEASE}\n" --specfile $(SPECFILE) --define "dist $(TARGETDIST)" | uniq)
 NVR:=$(SRC)-$(VERSION)-$(RELEASE)
 GITBRANCH:=$(shell git rev-parse --abbrev-ref HEAD)
-TARGETDIST:=fc24
-BUILDTARGET=fedora-24-x86_64
 
 .PHONY: test
 test: $(VENV)
@@ -76,16 +75,16 @@ $(SRC)-$(VERSION).tar.gz:
 .PHONY: mocksrpm
 mocksrpm: archive
 	mock -r $(BUILDTARGET) --buildsrpm --spec $(SPECFILE) --sources .
-	cp /var/lib/mock/$(BUILDTARGET)/result/$(NVR).$(TARGETDIST).src.rpm .
+	cp /var/lib/mock/$(BUILDTARGET)/result/$(NVR).src.rpm .
 
 .PHONY: mockbuild
 mockbuild: mocksrpm
-	mock -r $(BUILDTARGET) --no-clean --rebuild $(NVR).$(TARGETDIST).src.rpm
-	cp /var/lib/mock/$(BUILDTARGET)/result/$(NVR).$(TARGETDIST).noarch.rpm .
+	mock -r $(BUILDTARGET) --no-clean --rebuild $(NVR).src.rpm
+	cp /var/lib/mock/$(BUILDTARGET)/result/$(NVR).noarch.rpm .
 
 #.PHONY: kojibuild
 #kojibuild: mocksrpm
-#	koji build --scratch dist-6E-epel-testing-candidate $(NVR).$(TARGETDIST).src.rpm
+#	koji build --scratch dist-6E-epel-testing-candidate $(NVR).src.rpm
 
 .PHONY: nvr
 nvr: