- %with, %without, %ifwith %ifwithout macros added

Changed files:
    rpm.macros -> 1.117

diff --git a/rpm.macros b/rpm.macros
index a247fc6fe1b620ed6d617063b5686d27c7d9e03a..caa39d88a24f43c6f4b50fe17ce838b6e3824285 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -105,6 +105,14 @@
 %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.