makepkg: fix updating PKGBUILD when building SCM packages

Fixes a bug and resets pkgrel to 1 when bumping pkgver

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

scripts/makepkg.sh.in

@@ -1069,6 +1069,7 @@ devel_check() {
 		if [ "$newpkgver" != "" ]; then
 			msg2 "$(gettext "Version found: %s")" "$newpkgver"
 			pkgver=$newpkgver
+			pkgrel=1
 		fi
 
 	else
@@ -1088,8 +1089,9 @@ devel_update() {
 	#  _foo=pkgver
 	#
 	if [ "$newpkgver" != "" ]; then
-		if [ "newpkgver" != "$pkgver" ]; then
+		if [ "$newpkgver" != "$pkgver" ]; then
 			sed -i "s/^pkgver=[^ ]*/pkgver=$newpkgver/" ./$BUILDSCRIPT
+			sed -i "s/^pkgrel=[^ ]*/pkgrel=1/" ./$BUILDSCRIPT
 			source $BUILDSCRIPT
 		fi
 	fi