[packages/rpm-build-macros/rpm.org] - define _buildrootdir, dedup _topdir, use _tmppath everywhere
baggins
baggins at pld-linux.org
Mon Jan 13 23:43:10 CET 2020
commit 9188a223fdd3363312c763ed8e36035e913fc3b0
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Mon Jan 13 23:42:30 2020 +0100
- define _buildrootdir, dedup _topdir, use _tmppath everywhere
macros.pld | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/macros.pld b/macros.pld
index 01f5f0f..fa86208 100644
--- a/macros.pld
+++ b/macros.pld
@@ -126,13 +126,6 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
%__rc %{_bindir}/rc
%__xar %{_bindir}/xar
-%_tmppath %(echo "${TMPDIR:-/var/tmp}")
-%tmpdir %{_tmppath}
-
-%_topdir %(echo $HOME)/rpm
-
-%buildroot %{_tmppath}/%{name}-%{version}-root-%(id -u -n)
-
%_source_payload w9.gzdio
%_binary_payload w6.xzdio
@@ -277,6 +270,12 @@ pakietu oraz przy odpluskwianiu samego pakietu.\
fi; \
)}%_topdir
+%_tmppath %(echo "${TMPDIR:-/var/tmp}")
+%tmpdir %{_tmppath}
+
+%_buildrootdir %{_tmppath}
+%buildroot %{_buildrootdir}/%{name}-%{version}-%{_arch}-root-%(id -u -n)
+
# if %{_topdir}/SPECS exists, it's old style structure
%_specdir %{expand:%%global _specdir %([ ! -d %{_topdir}/SPECS ] && echo %{_topdir}/%{name} || echo %{_topdir}/SPECS)}%_specdir
%_sourcedir %{expand:%%global _sourcedir %([ ! -d %{_topdir}/SOURCES ] && echo %{_specdir} || echo %{_topdir}/SOURCES)}%_sourcedir
@@ -1390,10 +1389,10 @@ fi;
start=$(expr $base + %1);
end=$(expr $base + %{?2}%{!?2:%{1}});
# we need to call seq twice as it doesn't allow two formats
- seq -f 'Patch%g:' $start $end > %{tmpdir}/__ps1;
- seq -f '%{-f*}' %1 %{?2}%{!?2:%{1}} > %{tmpdir}/__ps2;
- paste %{tmpdir}/__ps{1,2};
- rm -f %{tmpdir}/__ps{1,2};
+ seq -f 'Patch%g:' $start $end > %{_tmppath}/__ps1;
+ seq -f '%{-f*}' %1 %{?2}%{!?2:%{1}} > %{_tmppath}/__ps2;
+ paste %{_tmppath}/__ps{1,2};
+ rm -f %{_tmppath}/__ps{1,2};
}
) \
%{nil}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rpm-build-macros.git/commitdiff/9188a223fdd3363312c763ed8e36035e913fc3b0
More information about the pld-cvs-commit
mailing list