packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[glen]

Author: glen                         Date: Sun Feb 14 13:16:35 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- if topdir logic is off, then spec/sourcedir won't work either

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.236 -> 1.237) , rpm.macros (1.538 -> 1.539) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.236 packages/rpm-build-macros/rpm-build-macros.spec:1.237
--- packages/rpm-build-macros/rpm-build-macros.spec:1.236	Sun Feb 14 12:21:51 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Sun Feb 14 14:16:29 2010
@@ -1,5 +1,5 @@
 # $Revision$, $Date$
-%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
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.237  2010/02/14 13:16:29  glen
+- if topdir logic is off, then spec/sourcedir won't work either
+
 Revision 1.236  2010/02/14 11:21:51  glen
 - fixed topdir location for now until best fit is found (if at all)
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.538 packages/rpm-build-macros/rpm.macros:1.539
--- packages/rpm-build-macros/rpm.macros:1.538	Sun Feb 14 12:21:43 2010
+++ packages/rpm-build-macros/rpm.macros	Sun Feb 14 14:16:29 2010
@@ -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
================================================================

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