From: Prarit Bhargava <pra...@redhat.com> redhat/Makefile: Rename RPMKVERSION to SPECKVERSION
Change RPMKVERSION to SPECVERSION so that readers understand it is passed into the spec file. Rename RPMKVERSION to SPECKVERSION. Signed-off-by: Prarit Bhargava <pra...@redhat.com> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -50,7 +50,7 @@ RPMBUILD:=$(shell if [ -x "/usr/bin/rpmbuild" ]; then echo rpmbuild; \ else echo rpm; fi) MACH:=$(shell uname -m) -RPMKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}') +SPECKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\ /{s///;p;q}') RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}') RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}') RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}') @@ -131,24 +131,24 @@ ifeq ("$(origin O)", "command line") endif # MARKER is the git tag which we base off of for exporting patches -# Make sure MARKER uses RPMKVERSION, RPMKPATCHLEVEL and RPMKEXTRAVERSION from +# Make sure MARKER uses SPECKVERSION, RPMKPATCHLEVEL and RPMKEXTRAVERSION from # the kernel makefile as opposed to any adjusted version for snapshotting. ifneq ($(RPMKEXTRAVERSION),) - MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION) + MARKER:=v$(SPECKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION) KEXTRAVERSION:=$(shell echo $(RPMKEXTRAVERSION) | sed -e s/-/./) PREBUILD:=0$(KEXTRAVERSION). - UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION) + UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION) else KEXTRAVERSION:= ifeq ($(RPMKSUBLEVEL),0) - MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL) - UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL) + MARKER:=v$(SPECKVERSION).$(RPMKPATCHLEVEL) + UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(RPMKPATCHLEVEL) else - # Make sure MARKER uses RPMKVERSION, RPMKPATCHLEVEL, and RPMKSUBLEVEL from - # the kernel makefile as opposed to any adjusted version for snapshotting. - # IOW these variables are *NOT* equivalent to the SPECVERSION variable. - MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) - UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) + # Make sure MARKER uses SPECKVERSION, RPMKPATCHLEVEL, and RPMKSUBLEVEL from + # from the kernel makefile as opposed to any adjusted version for snapshotting. + # IOW, these variables are *NOT* equivalent to the SPECVERSION variable. + MARKER:=v$(SPECKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) + UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) endif PREBUILD:= endif @@ -207,7 +207,7 @@ else SNAPSHOT:=0 endif -SPECVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) +SPECVERSION:=$(SPECKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL) PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID) KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(PKGRELEASE).tar.bz2 KABIDW := $(REDHAT)/kabi-dwarf @@ -494,7 +494,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check @rm $(TESTPATCH).tmp @cp $(TESTPATCH) $(SOURCES)/linux-kernel-test.patch @cat configs/flavors | while read flavor; do echo "Copying sources for $${flavor}"; [ -e $${flavor}_files ] && cp $${flavor}_files/* $(SOURCES); done - @sed -e "s/%%RPMKVERSION%%/$(RPMKVERSION)/" \ + @sed -e "s/%%SPECKVERSION%%/$(SPECKVERSION)/" \ -e "s/%%RPMKPATCHLEVEL%%/$(RPMKPATCHLEVEL)/" \ rpminspect.yaml > $(SOURCES)/rpminspect.yaml @cp cpupower.* \ diff --git a/redhat/genspec.sh b/redhat/genspec.sh index blahblah..blahblah 100755 --- a/redhat/genspec.sh +++ b/redhat/genspec.sh @@ -58,7 +58,7 @@ fi test -f "$SOURCES/$SPECFILE" && sed -i -e " s/%%BUILDID%%/$BUILDID_DEFINE/ - s/%%RPMKVERSION%%/$RPMKVERSION/ + s/%%SPECKVERSION%%/$SPECKVERSION/ s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/ s/%%PKGRELEASE%%/$PKGRELEASE/ s/%%SPECRELEASE%%/$SPECRELEASE/ @@ -93,7 +93,7 @@ fi GIT_FORMAT="--format=- %s (%an)%n%N%n^^^NOTES-END^^^%n%b" GIT_NOTES="--notes=refs/notes/${RHEL_MAJOR}.${RHEL_MINOR}*" -lasttag=$(git rev-list --first-parent --grep="^\[redhat\] kernel-${RPMKVERSION}.${RPMKPATCHLEVEL}" --max-count=1 HEAD) +lasttag=$(git rev-list --first-parent --grep="^\[redhat\] kernel-${SPECKVERSION}.${RPMKPATCHLEVEL}" --max-count=1 HEAD) # if we didn't find the proper tag, assume this is the first release if [[ -z $lasttag ]]; then if [[ -z ${MARKER//[0-9a-f]/} ]]; then @@ -174,12 +174,12 @@ if [ "$SINGLE_TARBALL" = 0 ]; then # May need to preserve word splitting in EXCLUDE_FILES # shellcheck disable=SC2086 git diff -p --no-renames --stat "$MARKER".. $EXCLUDE_FILES \ - > ${SOURCES}/patch-${RPMKVERSION}.${RPMKPATCHLEVEL}-redhat.patch + > ${SOURCES}/patch-${SPECKVERSION}.${RPMKPATCHLEVEL}-redhat.patch else # The tarball in the SRPM contains both upstream sources and OS-specifc # commits. Even though this is the case, an empty file for dist-git # compatibility is necessary. - touch "${SOURCES}/patch-${RPMKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch + touch "${SOURCES}/patch-${SPECKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch fi rm -f "$clogf"{,.stripped}; diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100755 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -125,10 +125,10 @@ Summary: The Linux kernel %endif # The kernel tarball/base version -%define kversion %%RPMKVERSION%%.%%RPMKPATCHLEVEL%% +%define kversion %%SPECKVERSION%%.%%RPMKPATCHLEVEL%% %define specversion %%SPECVERSION%% -%define patchversion %%RPMKVERSION%%.%%RPMKPATCHLEVEL%% +%define patchversion %%SPECKVERSION%%.%%RPMKPATCHLEVEL%% %define pkgrelease %%PKGRELEASE%% # This is needed to do merge window version magic @@ -1355,7 +1355,7 @@ ApplyPatch() exit 1 fi if ! grep -E "^Patch[0-9]+: $patch\$" %{_specdir}/${RPM_PACKAGE_NAME}.spec ; then - if [ "${patch:0:8}" != "patch-%%RPMKVERSION%%." ] ; then + if [ "${patch:0:8}" != "patch-%%SPECKVERSION%%." ] ; then echo "ERROR: Patch $patch not listed as a source patch in specfile" exit 1 fi diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7 b/redhat/self-test/data/centos-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.el7 +++ b/redhat/self-test/data/centos-2585cf9dfaad.el7 @@ -53,13 +53,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25 b/redhat/self-test/data/centos-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25 @@ -53,13 +53,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7 b/redhat/self-test/data/centos-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.el7 +++ b/redhat/self-test/data/centos-78e36f3b0dae.el7 @@ -53,13 +53,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION= RPMKPATCHLEVEL=17 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25 b/redhat/self-test/data/centos-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25 @@ -53,13 +53,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION= RPMKPATCHLEVEL=17 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7 b/redhat/self-test/data/centos-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.el7 +++ b/redhat/self-test/data/centos-df0cc57e057f.el7 @@ -53,13 +53,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION= RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25 b/redhat/self-test/data/centos-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-df0cc57e057f.fc25 +++ b/redhat/self-test/data/centos-df0cc57e057f.fc25 @@ -53,13 +53,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION= RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7 b/redhat/self-test/data/centos-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.el7 +++ b/redhat/self-test/data/centos-fce15c45d3fb.el7 @@ -53,13 +53,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25 b/redhat/self-test/data/centos-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/centos-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25 @@ -53,13 +53,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7 b/redhat/self-test/data/fedora-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.el7 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7 b/redhat/self-test/data/fedora-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.el7 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION= RPMKPATCHLEVEL=17 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25 +++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION= RPMKPATCHLEVEL=17 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7 b/redhat/self-test/data/fedora-df0cc57e057f.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.el7 +++ b/redhat/self-test/data/fedora-df0cc57e057f.el7 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION= RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25 b/redhat/self-test/data/fedora-df0cc57e057f.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-df0cc57e057f.fc25 +++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION= RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7 b/redhat/self-test/data/fedora-fce15c45d3fb.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.el7 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25 +++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7 b/redhat/self-test/data/rhel-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.el7 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7 @@ -51,13 +51,13 @@ RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 RPMKPATCHLEVEL=16 RPMKSUBLEVEL=0 -RPMKVERSION=5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727 _______________________________________________ kernel mailing list -- kernel@lists.fedoraproject.org To unsubscribe send an email to kernel-le...@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure