From 25ad440b2a40d251b40070b767a070352d8b4a93 Mon Sep 17 00:00:00 2001
From: Clark Williams <williams@redhat.com>
Date: Wed, 5 Jul 2023 08:57:36 -0500
Subject: [PATCH] add srpm target and sync version style between Makefile and
 specfile

Remove dropped package 'annobin' as build requirement
sync Makefile and specfile versioning

Signed-off-by: Clark Williams <williams@redhat.com>

Signed-off-by: Clark Williams <williams@redhat.com>
---
 Makefile            | 13 +++++++++----
 realtime-setup.spec | 12 +++++++++---
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index fc1a489..51fde94 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 VERSION	:=	$(shell awk '/^Version:/ { print $$2 }' realtime-setup.spec)
 $(info "Version: $(VERSION)")
 RPMDIR	:=	$(shell pwd)/rpm
@@ -27,21 +28,24 @@ FILES	:=	realtime-setup-kdump 		\
 		realtime-setup.service	\
 		realtime-setup.spec
 
+EXT 	:=	bz2
+TARBALL	:=	realtime-setup-v$(VERSION).tar.$(EXT)
+
+
 all:  realtime-entsk
 
 realtime-entsk: enable-netsocket-tstamp-static-key.c
 	$(CC) $(CFLAGS) -c enable-netsocket-tstamp-static-key.c
 	$(CC) $(LDFLAGS) -o realtime-entsk enable-netsocket-tstamp-static-key.o
 
-rpm:	rpmdir tarball
-	cp realtime-setup-$(VERSION).tar.bz2 rpm/SOURCES
+rpm:	srpm
 	rpmbuild $(RPMARGS) -ba realtime-setup.spec
 
 rpmdir:
 	@[ -d rpm ] || mkdir -p rpm/{BUILD,BUILDROOT,RPMS,SOURCES,SPECS,SRPMS}
 
 srpm: clean rpmdir tarball
-	mv realtime-setup-$(VERSION).tar.bz2 rpm/SOURCES
+	mv realtime-setup-v$(VERSION).tar.bz2 rpm/SOURCES
 	rpmbuild $(RPMARGS) -bs realtime-setup.spec
 
 clean:
@@ -50,7 +54,8 @@ clean:
 	rm -f realtime-entsk *.o
 
 tarball: rpmdir
-	git archive --format=tar --prefix=realtime-setup-$(VERSION)/ HEAD | bzip2 >realtime-setup-$(VERSION).tar.bz2
+	git archive --format=tar --prefix=realtime-setup-v$(VERSION)/ HEAD | \
+		bzip2 >realtime-setup-v$(VERSION).tar.bz2
 
 install:
 	install -m 755 -D realtime-setup-kdump  $(DEST)/usr/bin/realtime-setup-kdump
diff --git a/realtime-setup.spec b/realtime-setup.spec
index df9f48c..b917569 100644
--- a/realtime-setup.spec
+++ b/realtime-setup.spec
@@ -1,5 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
 Name: realtime-setup
-Version: 2.2.3
+Version: 2.3.1
 Release: 1%{?dist}
 License: GPLv2
 Summary: Setup RT/low-latency environment details
@@ -10,7 +11,6 @@ BuildRequires: gcc
 BuildRequires: make
 BuildRequires: systemd
 BuildRequires: systemd-rpm-macros
-BuildRequires: annobin
 Requires: pam
 Requires: kexec-tools
 Requires: tuna
@@ -71,9 +71,15 @@ Neither the slub script or realtime-entsk are active by default.
 %{_unitdir}/realtime-setup.service
 %{_bindir}/realtime-setup
 %{_unitdir}/realtime-entsk.service
-%license gpl-2.0.txt
+%{_bindir}/realtime-setup-kdump
 
 %changelog
+* Wed Jul 05 2023 Clark Williams <williams@redhatcom> - 2.3.1-1
+- Remove build require of annobin package
+- Update all files with SPDX identifier
+- add srpm target in Makefile
+- fix versioning in Makefile targets and specfile
+
 * Thu Jul 14 2022 Jiri Kastner<jkastner@fedoraproject.org> - 2.2.3-1
 - polish source url