From 38bd17faef5a823ddf4931d2fd76b194aee8ff1d Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 10 Mar 2020 10:34:35 +0100 Subject: [PATCH] Make cockpit-starter-kit.spec.in rpmspec compliant Use `%{VERSION}` as version macro instead of `@VERSION@`, so that the .spec.in file is syntactically a correct spec file that can be parsed with `rpmspec`. --- Makefile | 2 +- cockpit-starter-kit.spec.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 50dbf53..ff74dc7 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ dist/po.%.js: po/%.po $(NODE_MODULES_TEST) # %.spec: %.spec.in - sed -e 's/@VERSION@/$(VERSION)/g' $< > $@ + sed -e 's/%{VERSION}/$(VERSION)/g' $< > $@ $(WEBPACK_TEST): $(NODE_MODULES_TEST) $(shell find src/ -type f) package.json webpack.config.js $(patsubst %,dist/po.%.js,$(LINGUAS)) NODE_ENV=$(NODE_ENV) npm run build diff --git a/cockpit-starter-kit.spec.in b/cockpit-starter-kit.spec.in index 48f5b17..0207242 100644 --- a/cockpit-starter-kit.spec.in +++ b/cockpit-starter-kit.spec.in @@ -1,5 +1,5 @@ Name: cockpit-starter-kit -Version: @VERSION@ +Version: %{VERSION} Release: 1%{?dist} Summary: Cockpit Starter Kit Example Module License: LGPLv2+