diff options
author | Jani Välimaa <wally@mageia.org> | 2020-02-04 19:06:26 +0200 |
---|---|---|
committer | Jani Välimaa <wally@mageia.org> | 2020-02-04 19:06:26 +0200 |
commit | 5057c7c260790cbe5dffeb823ff186282cdfd7f1 (patch) | |
tree | d0a118c14df928ad5618448a3198c5a2a553b9f8 /build.macros.in | |
parent | 3f5d7e812da6e96654ed39917ccbd1f8046c3916 (diff) | |
download | rpm-setup-5057c7c260790cbe5dffeb823ff186282cdfd7f1.tar rpm-setup-5057c7c260790cbe5dffeb823ff186282cdfd7f1.tar.gz rpm-setup-5057c7c260790cbe5dffeb823ff186282cdfd7f1.tar.bz2 rpm-setup-5057c7c260790cbe5dffeb823ff186282cdfd7f1.tar.xz rpm-setup-5057c7c260790cbe5dffeb823ff186282cdfd7f1.zip |
build.macros: remove '--without <section>' rpmbuild functionality
It was the only leftover using _with().
Diffstat (limited to 'build.macros.in')
-rw-r--r-- | build.macros.in | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/build.macros.in b/build.macros.in index 50c8a1b..155148e 100644 --- a/build.macros.in +++ b/build.macros.in @@ -368,34 +368,15 @@ popd %rpmhelper_required_version 0.24.11 %systemd_required_version 195 -#------------------------------------------------------------------------------ -# Redefine RPM sections to allow jumping over them using "--without <section>". -# This an interesting alternative to --short-circuit. -# The following are mostly equivalent: -# % rpmbuild -bi --short-circuit foo.spec && rpmbuild -bb --short-circuit foo.spec -# % rpmbuild -bb --without build foo.spec - -%prep %%prep \ -[ %{_with prep} -eq 1 ] || exit 0 \ -[ %{_with build} -eq 1 ] || exit 0 \ -[ %{_with install} -eq 1 ] || exit 0 \ -%{nil} - -%build %%build \ -[ %{_with install} -eq 1 ] || exit 0 \ -[ %{_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 +%{nil} #--------------------------------------------------------------------- # Expanded at end of %install scriptlet. @@ -427,11 +408,6 @@ fi %install %{?_enable_debug_packages:%{?buildsubdir:%{debug_package}}}\ %%install\ -[ %{_with install} -eq 1 ] || exit 0 \ -%{nil} - -%check %%check \ -[ %{_with check} -eq 1 ] || exit 0 \ %{nil} # |