diff --git a/gtk/Makefile b/gtk/Makefile index 37f564b..0b82995 100644 --- a/gtk/Makefile +++ b/gtk/Makefile @@ -5,11 +5,12 @@ all: setup setup: build/ meson build -VER := 1.0.2 +VER_RAW := $(shell git -C .. describe --tags --abbrev=0 2>/dev/null || git -C .. describe --tags 2>/dev/null || printf '0.0.0') +VER := $(patsubst v%,%,$(VER_RAW)) TMP := $(shell mktemp -d) rpm: git -C .. archive --format=tar.gz --prefix=kordophone/ -o $(TMP)/v$(VER).tar.gz HEAD - rpmbuild -ba dist/rpm/kordophone.spec --define "_sourcedir $(TMP)" + rpmbuild -ba dist/rpm/kordophone.spec --define "_sourcedir $(TMP)" --define "app_version $(VER)" deb: ./dist/deb/build-deb.sh $(VER) diff --git a/gtk/dist/rpm/kordophone.spec b/gtk/dist/rpm/kordophone.spec index 5e099a4..2114710 100644 --- a/gtk/dist/rpm/kordophone.spec +++ b/gtk/dist/rpm/kordophone.spec @@ -1,5 +1,6 @@ +%global app_version %{!?app_version:1.3.0} Name: kordophone -Version: 1.0.2 +Version: %{app_version} Release: 1%{?dist} Summary: GTK4/Libadwaita client for Kordophone @@ -49,4 +50,3 @@ popd %changelog * Fri Aug 8 2025 James Magahern - Updated rpmspec -