aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2018-09-24 09:58:36 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2018-09-24 10:02:48 +0200
commit1fbe422dd575c8c6558c4d93c5c38c4b24cace2a (patch)
tree18e469f4363ff9f1ff74f7c6f6c9e9339b8a2270
parentc099a5321db72d2ae87d12de90afc185c8e39a5d (diff)
downloadrpm-setup-1fbe422dd575c8c6558c4d93c5c38c4b24cace2a.tar
rpm-setup-1fbe422dd575c8c6558c4d93c5c38c4b24cace2a.tar.gz
rpm-setup-1fbe422dd575c8c6558c4d93c5c38c4b24cace2a.tar.bz2
rpm-setup-1fbe422dd575c8c6558c4d93c5c38c4b24cace2a.tar.xz
rpm-setup-1fbe422dd575c8c6558c4d93c5c38c4b24cace2a.zip
move %__spec_install_pre too
it's now easier to compare with FC
-rw-r--r--build.macros.in26
1 files changed, 14 insertions, 12 deletions
diff --git a/build.macros.in b/build.macros.in
index 481d6cb..e014b51 100644
--- a/build.macros.in
+++ b/build.macros.in
@@ -261,18 +261,6 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o
%main_configure
-#---------------------------------------------------------------------
-# Expanded at beginning of %install scriptlet.
-#
-
-%__spec_install_pre \
-%{___build_pre}\
-if [ %{_with install} -eq 1 ]; then\
- [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
- mkdir -p `dirname "$RPM_BUILD_ROOT"`\
- mkdir "$RPM_BUILD_ROOT"\
-fi
-
# Maximum number of CPU's to use when building, 0 for unlimited.
%_smp_ncpus_max 0
@@ -446,6 +434,20 @@ popd
[ %{_with build} -eq 1 ] || exit 0 \
%{nil}
+#---------------------------------------------------------------------
+# Expanded at beginning of %install scriptlet.
+#
+
+%__spec_install_pre %{___build_pre}\
+if [ %{_with install} -eq 1 ]; then\
+ [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "${RPM_BUILD_ROOT}"\
+ mkdir -p `dirname "$RPM_BUILD_ROOT"`\
+ mkdir "$RPM_BUILD_ROOT"\
+fi
+
+#---------------------------------------------------------------------
+# Expanded at end of %install scriptlet.
+
%__os_install_post \
%{?__spec_helper_post}%{?!__spec_helper_post:/usr/share/spec-helper/spec-helper} \
%{?__brp_python_bytecompile} \