diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-02-12 14:57:55 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2020-02-12 14:57:55 +0100 |
| commit | 73670dca612cfb3bd0c632e7dc25d3255f6d65ef (patch) | |
| tree | 4a3b1e11139761530c256dbd9123ac16b6bc9eb1 | |
| parent | a8c34c9a3691b35881fd767b62f70a3752a85398 (diff) | |
| download | rpm-setup-73670dca612cfb3bd0c632e7dc25d3255f6d65ef.tar rpm-setup-73670dca612cfb3bd0c632e7dc25d3255f6d65ef.tar.gz rpm-setup-73670dca612cfb3bd0c632e7dc25d3255f6d65ef.tar.bz2 rpm-setup-73670dca612cfb3bd0c632e7dc25d3255f6d65ef.tar.xz rpm-setup-73670dca612cfb3bd0c632e7dc25d3255f6d65ef.zip | |
Revert "build.macros: drop unused _with() and _without() macros originating to RPM 4.4"
This reverts commit c77511f05f13b1d568a6f04a1a9cf2625f40666e.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build.macros.in | 5 |
2 files changed, 5 insertions, 2 deletions
@@ -7,8 +7,6 @@ Version 2.51 - 3 February 2020, by Jani Välimaa - build.macros: drop pyver macro (moved to python-rpm-macros) - build.macros: drop unused macros - _package_i18n() - - _with() - - _without() - py_platlibdir - py_purelibdir - py_platsitedir diff --git a/build.macros.in b/build.macros.in index 9962c7a..fb3b548 100644 --- a/build.macros.in +++ b/build.macros.in @@ -315,6 +315,11 @@ export CFLAGS="%optflags"; export CXXFLAGS="%optflags"; export RPM_OPT_FLAGS="%o Obsoletes: %{1} <= %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release} \ Provides: %{1} = %{?epoch:%epoch}%{?!epoch:0}:%{version}-%{release} +# Shorthand for %{defined with_...} +# macros provided by rpm 4.4, but buggy :( +%_with() %{expand: %%{?_with_%1:1} %%{!?_with_%1: %%{?_without_%1:0} %%{!?_without_%1: %%{?with_%1:%%{with_%1}} %%{!?with_%1: %%{?without_%1:!%%{without_%1}} %%{!?without_%1: %%{?2:%%2} %%{!?2:1} } } } } } +%_without() !%{expand: %%{with %1 %{?2:%2}}} + #------------------------------------------------------------------------------ # Java Macros # |