From 08563b331bcd76f6f6ca16605b5b4df4ae89dfae Mon Sep 17 00:00:00 2001
From: gbenson <gbenson@fedoraproject.org>
Date: Jan 11 2005 15:28:59 +0000
Subject: Allow non-free dependencies to be enabled on the commandline


---

diff --git a/log4j.spec b/log4j.spec
index 47b494b..f82d992 100644
--- a/log4j.spec
+++ b/log4j.spec
@@ -1,7 +1,5 @@
 %define section	free
-
-# This flag causes the omission of non-free dependencies.
-%define no_nonfree_deps 1
+%define build_nonfree  %{?_with_nonfree:1}%{!?_without_nonfree:0}
 
 Name:           log4j
 Version:        1.2.8
@@ -24,7 +22,7 @@ Patch0:         %{name}-logfactor5-userdir.patch
 Patch1:         %{name}-javadoc-xlink.patch
 Patch2:         %{name}-bz133180.patch
 BuildRequires:  ant, jaf >= 0:1.0.1-5jpp, javamail >= 0:1.2-5jpp
-%if !%{no_nonfree_deps}
+%if %{build_nonfree}
 BuildRequires:  jms, jmx
 %endif
 BuildRequires:  jndi, jpackage-utils >= 0:1.5, xml-commons-apis-javadoc
@@ -83,10 +81,10 @@ fi
 
 
 %build
-%if %{no_nonfree_deps}
-export CLASSPATH=%(build-classpath jaf javamail/mailapi)
-%else
+%if %{build_nonfree}
 export CLASSPATH=%(build-classpath jaf javamail/mailapi jms jmxri jmxtools)
+%else
+export CLASSPATH=%(build-classpath jaf javamail/mailapi)
 %endif
 ant jar javadoc