- removed ifdef, ifundef, ifwith and ifwithout macros; they all work by

  accident

Changed files:
    rpm.macros -> 1.119

diff --git a/rpm.macros b/rpm.macros
index bc79622056ff1e59b3f3e7f6e65d34ca691b6fb3..f84d8f06c87259611cf8d5025e24d3f109c8ef3d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -101,18 +101,10 @@
 %defined()     %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
 %undefined()   %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
 
-# Shorthand for %if %{defined ...}
-%ifdef()       %if %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
-%ifndef()      %if %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
-
 # Shorthand for %{defined with_...}
 %with()                %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
 %without()     %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
 
-# Shorthand for %if %{with ...}
-%ifwith()      %if %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
-%ifwithout()   %if %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
-
 # Handle conditional builds. %bcond_with is for case when feature is
 # default off and needs to be activated with --with ... command line 
 # switch. %bcond_without is for the dual case.
@@ -126,10 +118,10 @@
 #
 # %bcond_with extra_fonts
 # %bcond_without static
-# %ifdef with_extra_fonts
+# %if %{with extra_fonts}
 # ...
 # %endif
-# %ifdef with_static
+# %ifdef %{with static}
 # ...
 # %endif
 # %{?with_static: ... }