makepkg: fix updating pkgrel with pkgver in SCM packages

Commit 1e656c0a introduced the changing of pkgrel to 1 when the
pkgver was updated in SCM PKGBUILDs. However, the output in the
"Making package:" was wrong. Attempting to fix that created
another bug (FS#13416). Interestingly, pkgver was only ever
being updated in the fakeroot stage which caused this problem.
Now both pkgver and pkgrel are updated after the first
devel_check and devel_update. Enjoy the really long explaination
for a two line fix...

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>

1 files changed, 0 insertions, 2 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 42b1092a..d05d2403 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1072,8 +1072,6 @@ devel_check() {
 
 		if [ "$newpkgver" != "" ]; then
 			msg2 "$(gettext "Version found: %s")" "$newpkgver"
-			pkgver=$newpkgver
-			pkgrel=1
 		fi
 
 	else