packages: rpm-build-macros/rpm.macros - fixed topdir location for now until...

[glen]

Author: glen                         Date: Sun Feb 14 11:21:48 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed topdir location for now until best fit is found (if at all)

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.537 -> 1.538) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.537 packages/rpm-build-macros/rpm.macros:1.538
--- packages/rpm-build-macros/rpm.macros:1.537	Sun Feb 14 08:12:22 2010
+++ packages/rpm-build-macros/rpm.macros	Sun Feb 14 12:21:43 2010
@@ -56,12 +56,8 @@
 
 # topdir is where builder script lives, fallback to old style if builder script was not found and
 # SPECS/SOURCES dirs exist (XXX: should be reverse?)
-%_topdir    %{expand:%%global _topdir %(d=;\
-    d=${d:-$([ -d ../SPECS -a -d ../SOURCES ] && (cd .. && pwd))};\
-    d=${d:-$([ -x ../builder -a ! -d ../builder ] && (cd ..; pwd))};\
-    d=${d:-$([ -x builder -a ! -d builder ] && pwd)};\
-    echo ${d:-$HOME/rpm};\
-)}%_topdir
+# XXX: fixed location for now: ~/rpm/packages
+%_topdir    %{expand:%%global _topdir %(echo $HOME/rpm/packages)}%_topdir
 
 # if %{_topdir}/builder exists, it's new style structure
 %_specdir       %{expand:%%global _specdir %([ -x %{_topdir}/builder ] && echo %{_topdir}/%{name} || echo %{_topdir}/SPECS)}%_specdir
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.537&r2=1.538&f=u