diff options
| author | Jani Välimaa <wally@mageia.org> | 2020-02-02 10:47:59 +0200 |
|---|---|---|
| committer | Jani Välimaa <wally@mageia.org> | 2020-02-02 10:47:59 +0200 |
| commit | c77511f05f13b1d568a6f04a1a9cf2625f40666e (patch) | |
| tree | 3b46da2dc7e55427eb21d281124925947af968fc | |
| parent | a88564c3516862a71c3c49b66c52cf479c5a735e (diff) | |
| download | rpm-setup-c77511f05f13b1d568a6f04a1a9cf2625f40666e.tar rpm-setup-c77511f05f13b1d568a6f04a1a9cf2625f40666e.tar.gz rpm-setup-c77511f05f13b1d568a6f04a1a9cf2625f40666e.tar.bz2 rpm-setup-c77511f05f13b1d568a6f04a1a9cf2625f40666e.tar.xz rpm-setup-c77511f05f13b1d568a6f04a1a9cf2625f40666e.zip | |
build.macros: drop unused _with() and _without() macros originating to RPM 4.4
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | build.macros.in | 5 |
2 files changed, 2 insertions, 5 deletions
@@ -2,6 +2,8 @@ - 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 56ac31d..50c8a1b 100644 --- a/build.macros.in +++ b/build.macros.in @@ -315,11 +315,6 @@ 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 # |