make: Replace RPM -> PKG

jw-pkg supports more than RPM-based package managers, but for
historic reasons, lots of its Makefile variables still have "RPM" in
their names. This is misleading. Replace "RPM" in variable names by
the more generic "PKG" where appropriate.

Signed-off-by: Jan Lindemann <jan@janware.com>

scripts/mkspec-wrapper.sh

@@ -19,9 +19,6 @@ append()
 #set -x
 
 MYNAME=`basename $0`
-ID=`whoami`
-[ ! "$INSTALL_LOG" ] && INSTALL_LOG=/tmp/rpmbuild-$ID/install.log
-
 eval set -- `getopt -l "provides-run:" -l "provides-devel:" -o "P:T:V:S:N:hR:D:X:Y:d:" -- "$@"`
 
 while [ "$1" != -- ]; do
@@ -78,6 +75,9 @@ shift
 done
 shift
 
+ID=`whoami`
+[ ! "$INSTALL_LOG" ] && INSTALL_LOG=/tmp/pkg-build-$ID-$NAME/install.log
+
 MKSPEC_SH="$1"
 shift
 

scripts/pkg.sh

@@ -67,7 +67,7 @@ scm_commit()
 
 platform()
 {
-	echo `get_os`/$RPM_ARCH
+	echo `get_os`/$PKG_ARCH
 }
 
 abspath()
@@ -175,22 +175,22 @@ check_next_version()
 	local v=`read_map $TOPDIR/VERSION | sed 's/-dev//'`
 	local n=`read_map -n $TOPDIR/RELEASES | sed 's/-dev//'`
 	if [ "$n" != "$v" ]; then
-		echo "+ $RPM_PROJECT version is already at $v, no need to increase for release" >&2
+		echo "+ $PKG_PROJECT version is already at $v, no need to increase for release" >&2
 		echo $v
 		return
 	fi
 	local h=`calculate_hash`
 	if [ ! -f $TOPDIR/HASH ]; then
-		echo "+ $RPM_PROJECT has no HASH file, needs release" >&2
+		echo "+ $PKG_PROJECT has no HASH file, needs release" >&2
 		echo $v
 		return
 	fi
 	if ! read_map $TOPDIR/HASH | grep -q $h; then
-		echo "+ $RPM_PROJECT has no matching HASH value, needs release" >&2
+		echo "+ $PKG_PROJECT has no matching HASH value, needs release" >&2
 		increase_build_no $v
 		return
 	fi
-	echo "+ $RPM_PROJECT has unchanged source" >&2
+	echo "+ $PKG_PROJECT has unchanged source" >&2
 	if [ "$reinstall_check_failed" = 1 ]; then
 		echo "version $v is uninstallable, needs release" >&2
 		increase_build_no $v
@@ -230,10 +230,10 @@ check_pkg_reinstall()
 	local v=`read_map $TOPDIR/VERSION`
 	local s
 	for s in devel run; do
-		if $RPM -q $RPM_PROJECT-$s > /dev/null 2>&1 ; then
-			echo + removing $RPM_PROJECT-$s
-			sudo $RPM -e $RPM_PROJECT-$s --nodeps --allmatches || {
-				echo "failed to uninstall $RPM_PROJECT-$s, ignored"
+		if $RPM -q $PKG_PROJECT-$s > /dev/null 2>&1 ; then
+			echo + removing $PKG_PROJECT-$s
+			sudo $RPM -e $PKG_PROJECT-$s --nodeps --allmatches || {
+				echo "failed to uninstall $PKG_PROJECT-$s, ignored"
 			}
 		fi
 	done
@@ -241,15 +241,15 @@ check_pkg_reinstall()
 	local suffix
 	case "$PKG_FORMAT" in
 	rpm)
-		suffix=-$v.$RPM_ARCH.rpm
+		suffix=-$v.$PKG_ARCH.rpm
 		;;
 	*)
-		suffix=_$v""_$RPM_ARCH.deb
+		suffix=_$v""_$PKG_ARCH.deb
 		;;
 	esac
 
-	check_pkg_install $TOPDIR/$DIST_PCKG_DIR/$RPM_PROJECT-run$suffix || return 1
-	check_pkg_install -c $TOPDIR/$DIST_PCKG_DIR/$RPM_PROJECT-devel$suffix || return 1;
+	check_pkg_install $TOPDIR/$DIST_PCKG_DIR/$PKG_PROJECT-run$suffix || return 1
+	check_pkg_install -c $TOPDIR/$DIST_PCKG_DIR/$PKG_PROJECT-devel$suffix || return 1;
 }
 
 check_release_is_current()
@@ -432,7 +432,7 @@ build_pkg()
 	set -e
 
 	local version=`read_map $TOPDIR/VERSION | sed 's/-dev//'`
-	local src_base=$RPM_PROJECT-$version
+	local src_base=$PKG_PROJECT-$version
 	local src_tree=$DIST_SRC_DIR/$src_base
 	local tar_archive=$src_base.tar.bz2
 	local tar_archive_orig=$src_base.orig.tar.bz2
@@ -442,12 +442,12 @@ build_pkg()
 		echo $@ | sed "s/__NEXT_VERSION__/$version/g; s/VERSION-REVISION/$version/g; s/VERSION/$version/g"
 	}
 
-	local rpm_requires_run=`expand_version_macros $RPM_REQUIRES_RUN`
-	local rpm_requires_devel=`expand_version_macros $RPM_REQUIRES_DEVEL`
-	local rpm_conflicts_run=`expand_version_macros $RPM_CONFLICTS_RUN`
-	local rpm_conflicts_devel=`expand_version_macros $RPM_CONFLICTS_DEVEL`
-	local rpm_provides_run=`expand_version_macros $RPM_PROVIDES_RUN`
-	local rpm_provides_devel=`expand_version_macros $RPM_PROVIDES_DEVEL`
+	local rpm_requires_run=`expand_version_macros $PKG_REQUIRES_RUN`
+	local rpm_requires_devel=`expand_version_macros $PKG_REQUIRES_DEVEL`
+	local rpm_conflicts_run=`expand_version_macros $PKG_CONFLICTS_RUN`
+	local rpm_conflicts_devel=`expand_version_macros $PKG_CONFLICTS_DEVEL`
+	local rpm_provides_run=`expand_version_macros $PKG_PROVIDES_RUN`
+	local rpm_provides_devel=`expand_version_macros $PKG_PROVIDES_DEVEL`
 
 	# --- create source directory tree
 	create_empty_dir $src_tree "Source files compilation directory"
@@ -500,7 +500,7 @@ build_pkg()
 			PATH=$JWB_SCRIPT_DIR:$PATH /bin/bash $mkdef_wrapper_sh $mkdef_sh \
 				-V $version \
 				-S $tar_archive \
-				-N $RPM_PROJECT \
+				-N $PKG_PROJECT \
 				-R "$rpm_requires_run" \
 				-X "$rpm_conflicts_run" \
 				-D "$rpm_requires_devel" \
@@ -509,7 +509,7 @@ build_pkg()
 				--provides-devel "$rpm_provides_devel" \
 				-P $PROJECT \
 				-d $distribution \
-				> $RPM_PROJECT.$deffmt
+				> $PKG_PROJECT.$deffmt
 		)
 	done
 
@@ -521,9 +521,13 @@ build_pkg()
 	case "$PKG_FORMAT" in
 	rpm)
 		# --- build RPMs and copy them to source directory
+		local rpmbuild_root=$HOME/rpmbuild
+		[ `id -u` = 0 ] && rpmbuild_root=/usr/src/packages
+		local rpmbuild_srpms=$rpmbuild_root/SRPMS
+		local rpmbuild_rpms=$rpmbuild_root/RPMS/$PKG_ARCH
 		rpmbuild -ta  $DIST_PCKG_DIR/$tar_archive
-		cp $SRPMS_DIR/$src_base.src.rpm $DIST_PCKG_DIR/
-		cp $RPMS_DIR/$RPM_PROJECT-*-$version.$RPM_ARCH.rpm $DIST_PCKG_DIR/
+		cp $rpmbuild_srpms/$src_base.src.rpm $DIST_PCKG_DIR/
+		cp $rpmbuild_rpms/$PKG_PROJECT-*-$version.$PKG_ARCH.rpm $DIST_PCKG_DIR/
 		;;
 	*)
 		#exit
@@ -605,10 +609,10 @@ upload_pkg()
 	case $PKG_FORMAT in
 	rpm)
 		server=pkg.janware.com
-		upload_file $RPM_PROJECT-$v.tar.bz2 tgz
-		upload_file $RPM_PROJECT-$v.src.rpm src
-		upload_file $RPM_PROJECT-run-$v.$RPM_ARCH.rpm $RPM_ARCH
-		upload_file -q $RPM_PROJECT-devel-$v.$RPM_ARCH.rpm $RPM_ARCH
+		upload_file $PKG_PROJECT-$v.tar.bz2 tgz
+		upload_file $PKG_PROJECT-$v.src.rpm src
+		upload_file $PKG_PROJECT-run-$v.$PKG_ARCH.rpm $PKG_ARCH
+		upload_file -q $PKG_PROJECT-devel-$v.$PKG_ARCH.rpm $PKG_ARCH
 		;;
 	debian|deb)
 		local -r server=apt.janware.com
@@ -638,7 +642,7 @@ upload_pkg()
 		#pre_upload_command =
 		#default_host_main =
 		EOT
-		dput -c $conf janware-debian dist/src/"$RPM_PROJECT"_"$v"_"$RPM_ARCH".changes
+		dput -c $conf janware-debian dist/src/"$PKG_PROJECT"_"$v"_"$PKG_ARCH".changes
 		rm -f $conf
 		;;
 	*)
@@ -1121,7 +1125,7 @@ trap goodbye SIGINT SIGKILL
 
 # -- default values
 TOPDIR=.
-CHECK_CVS_SYNC_BEFORE_RPM_RELEASE=false
+PKG_CHECK_VCS_SYNC_BEFORE_RELEASE=false
 myname="${0##*/}"
 cmdline="$0 $@"
 tmp_mkdef_sh=""
@@ -1129,10 +1133,10 @@ PROJECT_DESCR_FILE=$TOPDIR/make/project.conf
 DIST_SRC_DIR=dist/src
 DIST_INST_DIR=dist/src
 DIST_PCKG_DIR=dist/pckg
-RPM_PROJECT="$PROJECT"
-RPM_REQUIRES_RUN=""
-RPM_REQUIRES_DEVEL=""
-RPM_ARCH=$HOSTTYPE
+PKG_PROJECT="$PROJECT"
+PKG_REQUIRES_RUN=""
+PKG_REQUIRES_DEVEL=""
+PKG_ARCH=$HOSTTYPE
 PKG_FORMAT=rpm
 SSH=ssh
 SCM=cvs
@@ -1159,31 +1163,31 @@ while [ ${1:0:1} = - ]; do
 		shift
 		;;
 	-N)
-		eval RPM_PROJECT=\"$2\"
+		eval PKG_PROJECT=\"$2\"
 		shift
 		;;
 	-R)
-		eval RPM_REQUIRES_RUN=\"$2\"
+		eval PKG_REQUIRES_RUN=\"$2\"
 		shift
 		;;
 	-X)
-		eval RPM_CONFLICTS_RUN=\"$2\"
+		eval PKG_CONFLICTS_RUN=\"$2\"
 		shift
 		;;
 	-D)
-		eval RPM_REQUIRES_DEVEL=\"$2\"
+		eval PKG_REQUIRES_DEVEL=\"$2\"
 		shift
 		;;
 	-Y)
-		eval RPM_CONFLICTS_DEVEL=\"$2\"
+		eval PKG_CONFLICTS_DEVEL=\"$2\"
 		shift
 		;;
 	--provides-run)
-		eval RPM_PROVIDES_RUN=\"$2\"
+		eval PKG_PROVIDES_RUN=\"$2\"
 		shift
 		;;
 	--provides-devel)
-		eval RPM_PROVIDES_DEVEL=\"$2\"
+		eval PKG_PROVIDES_DEVEL=\"$2\"
 		shift
 		;;
 	-P)
@@ -1191,7 +1195,7 @@ while [ ${1:0:1} = - ]; do
 		shift
 		;;
 	-a)
-		eval RPM_ARCH=\"$2\"
+		eval PKG_ARCH=\"$2\"
 		shift
 		;;
 	-F)
@@ -1227,14 +1231,6 @@ export JWB_SCRIPT_DIR=`readlink -f $JWB_SCRIPT_DIR`
 export PKG_SH=`readlink -f $0`
 
 
-if [ `whoami` = root ]; then
-	RPMS_BUILD_DIR=/usr/src/packages
-else
-	RPMS_BUILD_DIR=$HOME/rpmbuild
-fi
-SRPMS_DIR=$RPMS_BUILD_DIR/SRPMS
-RPMS_DIR=$RPMS_BUILD_DIR/RPMS/$RPM_ARCH
-
 # shift
 
 [ ! "$cmd" ] && {