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

diff --git a/macros.pld b/macros.pld
index b2b26c0b21bc09132bbb3f77782a0e1bea5a88e0..c1887605d62be74e41edf9c1c5c8e312f3fb01b1 100644 (file)
--- 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

diff --git a/rpm-pld-macros.spec b/rpm-pld-macros.spec
index a3b84fff5ede33ff18652647b8d5d9548eeb3b42..f9bd2fac79e73b16ed72a83d17033051abd811a3 100644 (file)
--- 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