From 0eaee4ebe96cb25601d8a4ea79bd475240c8fdf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sat, 19 Jan 2019 02:36:57 +0000
Subject: build.sh, etc/build.usage, subr/*: merges {-[ptz],--rpm} into -D
 {minipix,pkg,rpm,t{bz2,gz,xz},zipdist}. subr/{build_args,pkg_clean}.subr:
 cleanup ${ARG_CLEAN_BUILDS} usage. vars/build.vars:dist: merged into
 invariants. vars/invariants_minipix.vars: adapted from
 vars/dist_minipix_dist.vars. vars/{invariants_tarballs,midipix}.vars: don't
 produce source tarballs.

---
 subr/pkg_install_rpm.subr | 43 +++++++++++++++++++++----------------------
 1 file changed, 21 insertions(+), 22 deletions(-)

(limited to 'subr/pkg_install_rpm.subr')

diff --git a/subr/pkg_install_rpm.subr b/subr/pkg_install_rpm.subr
index cd920eb6..691fe04c 100644
--- a/subr/pkg_install_rpm.subr
+++ b/subr/pkg_install_rpm.subr
@@ -4,25 +4,23 @@
 
 pkg_install_rpm() {
 	local _pkg_url="" _pkg_version_full="" _pkg_version_rpm="";
-	if [ "${ARG_RPM:-0}" -eq 0 ]\
-	|| [ "${PKG_RPM_DISABLE:-0}" -eq 1 ]\
-	|| ! [ -x "$(which rpmbuild 2>/dev/null)" ]; then
-		return 0;
-	fi; 
-	if [ -n "${PKG_URL}" ]; then
-		_pkg_version_rpm="${PKG_VERSION%%-*}";
-		_pkg_version_full="${PKG_VERSION}";
-		_pkg_url="${PKG_URL}";
-	elif [ -n "${PKG_URLS_GIT}" ]; then
-		_pkg_version_rpm="$(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse HEAD)";
-		_pkg_version_full="${_pkg_version_rpm} ($(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse --abbrev-ref HEAD))";
-		_pkg_url="${PKG_URLS_GIT%% *}";
-		_pkg_url="${_pkg_url##*=}"; _pkg_url="${_pkg_url%%@*}";
-		if [ "${_pkg_url#${DEFAULT_GITROOT_HEAD}}" != "${_pkg_url}" ]; then
-			_pkg_url="Unknown";
+	if ex_rtl_lmatch "${ARG_DIST}" , rpm	\
+	&& [ "${PKG_RPM_DISABLE:-0}" -eq 0 ]	\
+	&& [ -x "$(which rpmbuild 2>/dev/null)" ]; then
+		if [ -n "${PKG_URL}" ]; then
+			_pkg_version_rpm="${PKG_VERSION%%-*}";
+			_pkg_version_full="${PKG_VERSION}";
+			_pkg_url="${PKG_URL}";
+		elif [ -n "${PKG_URLS_GIT}" ]; then
+			_pkg_version_rpm="$(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse HEAD)";
+			_pkg_version_full="${_pkg_version_rpm} ($(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse --abbrev-ref HEAD))";
+			_pkg_url="${PKG_URLS_GIT%% *}";
+			_pkg_url="${_pkg_url##*=}"; _pkg_url="${_pkg_url%%@*}";
+			if [ "${_pkg_url#${DEFAULT_GITROOT_HEAD}}" != "${_pkg_url}" ]; then
+				_pkg_url="Unknown";
+			fi;
 		fi;
-	fi;
-	cat > "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" <<EOF
+		cat > "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" <<EOF
 Name:           ${PKG_NAME}
 Version:        ${_pkg_version_rpm}
 Release:        1
@@ -49,10 +47,11 @@ cp -pPr "${PKG_DESTDIR}/." "\${RPM_BUILD_ROOT}"
 %changelog
 
 EOF
-	rpmbuild -bb --define="_topdir ${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}" --nodeps "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec";
-	find "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}/RPMS" -iname \*.rpm -exec cp -pP {} "${PREFIX_RPM}/" \;;
-	ex_rtl_fileop rm "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}";
-	ex_rtl_fileop cp "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" "${PREFIX_RPM}/";
+		rpmbuild -bb --define="_topdir ${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}" --nodeps "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec";
+		find "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}/RPMS" -iname \*.rpm -exec cp -pP {} "${PREFIX_RPM}/" \;;
+		ex_rtl_fileop rm "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}";
+		ex_rtl_fileop cp "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" "${PREFIX_RPM}/";
+	fi;
 };
 
 # vim:filetype=sh
-- 
cgit v1.2.3