v1.717: %py_install_opts, %py3_install_opts

moved from %py_install, %py3_install so it could be used elsewhere in
install section

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 72331d488ac5ec8716cdb2ed14936d2cc05ecc9e..0c15aa1c2626c34882a3d46e0ada74d5440d36cd 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,4 +1,4 @@
-%define                rpm_macros_rev  1.716
+%define                rpm_macros_rev  1.717
 %define                find_lang_rev   1.38
 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 1c07df41438e923337309c0fde441c30f4326261..aeb242c2e0f8bb96568419ba49168e01f4ef84d6 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -1107,7 +1107,7 @@ fi \
 
 %py3_ocomp             %{__python3} -O -c "import compileall; import sys; compileall.compile_dir(sys.argv[1], ddir=sys.argv[1][len('$RPM_BUILD_ROOT'):])"
 
-%py_build      { \
+%py_build { \
        LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
        CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
        CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
@@ -1117,7 +1117,16 @@ fi \
                                build --build-base=build-2 \
 }
 
-%py_install    { \
+# "shrink" filter to keep this macro without newlines,
+# so it could be used as make arguments
+%py_install_opts() %{shrink: \
+       --prefix=%{_prefix} \
+       --install-purelib=%{py_sitescriptdir} \
+       --install-platlib=%{py_sitedir} \
+       --optimize=2 \
+}
+
+%py_install { \
        LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
        CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
        CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
@@ -1126,14 +1135,11 @@ fi \
        %{__python} setup.py \
                                build --build-base=build-2 \
                                install --skip-build \
-                               --prefix=%{_prefix} \
-                               --install-purelib=%{py_sitescriptdir} \
-                               --install-platlib=%{py_sitedir} \
-                               --optimize=2 \
+                               %{py_install_opts} \
                                --root=$RPM_BUILD_ROOT \
 }
 
-%py3_build     { \
+%py3_build { \
        LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
        CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
        CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
@@ -1142,7 +1148,16 @@ fi \
        %{__python3} setup.py build --build-base=build-3 \
 }
 
-%py3_install   { \
+# "shrink" filter to keep this macro without newlines,
+# so it could be used as make arguments
+%py3_install_opts() %{shrink: \
+       --prefix=%{_prefix} \
+       --install-purelib=%{py3_sitescriptdir} \
+       --install-platlib=%{py3_sitedir} \
+       --optimize=2 \
+}
+
+%py3_install { \
        LDFLAGS="${LDFLAGS:-%rpmldflags}"; export LDFLAGS; \
        CFLAGS="${CFLAGS:-%rpmcppflags %rpmcflags}"; export CFLAGS; \
        CXXFLAGS="${CXXFLAGS:-%rpmcppflags %rpmcxxflags}"; export CXXFLAGS; \
@@ -1151,10 +1166,7 @@ fi \
        %{__python3} setup.py \
                                build --build-base=build-3 \
                                install --skip-build \
-                               --prefix=%{_prefix} \
-                               --install-purelib=%{py3_sitescriptdir} \
-                               --install-platlib=%{py3_sitedir} \
-                               --optimize=2 \
+                               %{py3_install_opts} \
                                --root=$RPM_BUILD_ROOT \
 }