From dae90264100579bf5b3a28ba54c15a864801138e Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Fri, 28 Jan 2022 13:36:47 +0100 Subject: [PATCH] fix: auto-detect release version from git tag --- .drone.env | 1 + Makefile | 2 +- cups.spec | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.drone.env b/.drone.env index 2665793..ca87d84 100644 --- a/.drone.env +++ b/.drone.env @@ -1,2 +1,3 @@ # renovate: datasource=github-releases depName=OpenPrinting/cups versioning=loose export CUPS_VERSION="${CUPS_VERSION:-v2.4.1}" +export CUPS_RELEASE="${DRONE_TAG##*-}" diff --git a/Makefile b/Makefile index cab6bd5..339df21 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,7 @@ prepare: .PHONY: build build: source $(WORKDIR)/.drone.env && \ - rpmbuild -ba --without libusb1 --define "version_ $${CUPS_VERSION##v}" cups.spec + rpmbuild -ba --without libusb1 --define "release_ $${CUPS_RELEASE:-0}" --define "version_ $${CUPS_VERSION##v}" cups.spec .PHONY: clean clean: diff --git a/cups.spec b/cups.spec index 4cd65c6..e167886 100644 --- a/cups.spec +++ b/cups.spec @@ -44,7 +44,7 @@ Summary: CUPS Name: cups Version: %{version_} -Release: 2%{?dist} +Release: %{release_}%{?dist} Epoch: 1 License: GPL Group: System Environment/Daemons