From 72fdc562088777393ea60f2be3478841104ff463 Mon Sep 17 00:00:00 2001 From: Cheyenne Wills Date: Fri, 31 Jan 2020 16:14:40 -0700 Subject: [PATCH] RedHat: Update makesrpm.pl to use @PACKAGE_VERSION@ instead of @VERSION@ Commit 2f2c2ce62aa17ecac3651d64c1168af926f7458b 'Remove automake autoconf vars' replaced the automake variable @VERSION@ with the autoconf variable @PACKAGE_VERSION@. (Gerrit #13357) The RedHat openafs.spec.in is not processed using autoconf, but by 'makesrpm.pl', which was not updated to use @PACKAGE_VERSION@. Update makesprm.pl to use @PACKAGE_VERSION@ instead of @VERSION@ Reviewed-on: https://gerrit.openafs.org/13887 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Benjamin Kaduk (cherry picked from commit b03f3e6101ff21a6f148c555c213c47678482a7b) Change-Id: I6bc27474b1b8dfa8b63806a4e0e996a00dd302e4 Reviewed-on: https://gerrit.openafs.org/14050 Tested-by: BuildBot Reviewed-by: Michael Meffie Reviewed-by: Stephan Wiesand --- src/packaging/RedHat/makesrpm.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packaging/RedHat/makesrpm.pl b/src/packaging/RedHat/makesrpm.pl index e36b6b796..7744d5dc2 100755 --- a/src/packaging/RedHat/makesrpm.pl +++ b/src/packaging/RedHat/makesrpm.pl @@ -123,7 +123,7 @@ chmod 0755, $tmpdir."/rpmdir/SOURCES/openafs-kvers-is.sh"; # Create the specfile. Use sed for this, cos its easier system("cat ".$srcdir."/src/packaging/RedHat/openafs.spec.in | ". - "sed -e 's/\@VERSION\@/$afsversion/g' ". + "sed -e 's/\@PACKAGE_VERSION\@/$afsversion/g' ". " -e 's/\@LINUX_PKGVER\@/$linuxver/g' ". " -e 's/\@LINUX_PKGREL\@/$linuxrel/g' ". " -e 's/\%define afsvers.*/%define afsvers $afsversion/g' ". -- 2.39.5