- if topdir logic is off, then spec/sourcedir won't work either

Changed files:
    rpm-build-macros.spec -> 1.237
    rpm.macros -> 1.539

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 4cc05a786131e1897e80f11b7f2e3d0cfd1edd2f..17806c76a41b5850a274a1a5cbff2b54e869c130 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.538
+%define                rpm_macros_rev  1.539
 %define                find_lang_rev   1.32
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD

diff --git a/rpm.macros b/rpm.macros
index 4d6b00a648d860eed8298db2b44df1880ac8008f..ad52bae9cc9832fd548285537529d6af35aa0dbf 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -57,11 +57,12 @@
 # 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?)
 # XXX: fixed location for now: ~/rpm/packages
-%_topdir    %{expand:%%global _topdir %(echo $HOME/rpm/packages)}%_topdir
+%_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
-%_sourcedir            %{expand:%%global _sourcedir %([ -x %{_topdir}/builder ] && echo %{_specdir} || echo %{_topdir}/SOURCES)}%_sourcedir
+# XXX: fixed location for now: topdir/{SPECS,SOURCES}
+%_specdir       %{_topdir}/SPECS
+%_sourcedir            %{_topdir}/SOURCES
 
 # BUILD/RPMS/SRPMS are one same level by default as packages dir, if these exist
 # if they don't exist assume we are having custom topdir (which is not named as