SOURCES: rpm.macros - removed bcond macros; applied upstream

[glen]

Author: glen                         Date: Wed Nov  2 22:37:40 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- removed bcond macros; applied upstream

---- Files affected:
SOURCES:
   rpm.macros (1.256 -> 1.257) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.256 SOURCES/rpm.macros:1.257
--- SOURCES/rpm.macros:1.256	Wed Nov  2 23:30:16 2005
+++ SOURCES/rpm.macros	Wed Nov  2 23:37:35 2005
@@ -124,49 +124,6 @@
 unset LINGUAS ||:\
 %{nil}
 
-# ------------------------------------------------------------------------
-# Conditional build stuff.
-
-# Check if symbol is defined.
-# Example usage: %if %{defined with_foo} && %{undefined with_bar} ...
-%defined()	%{expand:%%{?%{1}:1}%%{!?%{1}:0}}
-%undefined()	%{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}}
-
-# 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.
-#
-# %bcond_with foo defines symbol with_foo if --with foo was specified on
-# command line.
-# %bcond_without foo defines symbol with_foo if --without foo was *not* 
-# specified on command line.
-#
-# For example:
-#
-# %bcond_with extra_fonts
-# %bcond_without static
-# %if %{with extra_fonts}
-# ...
-# %endif
-# %ifdef %{with static}
-# ...
-# %endif
-# %{?with_static: ... }
-# %{!?with_static: ... }
-# %{?with_extra_fonts: ... }
-# %{!?with_extra_fonts: ... }
-# 
-# The bottom line: never use without_foo, _with_foo nor _without_foo, only
-# with_foo. This way changing default set of bconds for given spec is just
-# a matter of changing single line in it and syntax is more readable.
-%bcond_with()		%{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
-%bcond_without()	%{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}
-# ------------------------------------------------------------------------
-
 # Location of autoconf macros
 %_aclocaldir	%(aclocal --print-ac-dir)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/rpm.macros?r1=1.256&r2=1.257&f=u