[packages/rpm-pld-macros] don't consider /usr/bin to be valid %{_topdir}; rel 5

[atler]

commit 3878047d4d0da027707b80d897b1eed0ff98f771
Author: Jan Palus <atler at pld-linux.org>
Date:   Fri Oct 28 21:58:28 2022 +0200

    don't consider /usr/bin to be valid %{_topdir}; rel 5

 macros.pld          | 4 ++--
 rpm-pld-macros.spec | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index a3b84ff..f9bd2fa 100644
--- a/rpm-pld-macros.spec
+++ b/rpm-pld-macros.spec
@@ -6,7 +6,7 @@ Summary:	PLD Linux RPM macros
 Summary(pl.UTF-8):	Makra RPM dla Linuksa PLD
 Name:		rpm-pld-macros
 Version:	%{rpm_macros_rev}
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		Development/Building
 Source0:	macros.pld
diff --git a/macros.pld b/macros.pld
index b2b26c0..c188760 100644
--- a/macros.pld
+++ b/macros.pld
@@ -281,10 +281,10 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
 	elif [ -d $HOME/rpm/SPECS -a -d $HOME/rpm/SOURCES ]; then \
 		# if old style rpm dir exist, go with it
 		echo $HOME/rpm; \
-	elif [ -x ../builder -a ! -d ../builder ]; then
+	elif [ -x ../builder -a ! -d ../builder ] && [ "$(realpath -s ../builder)" != "/usr/bin/builder" ]; then
 		# relative new style rpmdir: in package dir
 		cd ..; pwd
-	elif [ -x builder -a ! -d builder ]; then
+	elif [ -x builder -a ! -d builder ] && [ "$(realpath -s builder)" != "/usr/bin/builder" ]; then
 		# relative new style rpmdir: in packages
 		pwd
 	elif [ -x packages/builder -a ! -d packages/builder ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm-pld-macros.git/commitdiff/3878047d4d0da027707b80d897b1eed0ff98f771