rpms/xom/devel xom.spec,1.2,1.3

[Nuno Santos (nsantos)]

Author: nsantos

Update of /cvs/extras/rpms/xom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25413

Modified Files:
	xom.spec 
Log Message:
applied patch from vivekl: Make build with dom4j optional (off by default)


Index: xom.spec
===================================================================
RCS file: /cvs/extras/rpms/xom/devel/xom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xom.spec	12 Mar 2007 23:12:01 -0000	1.2
+++ xom.spec	13 Mar 2007 14:08:57 -0000	1.3
@@ -28,10 +28,15 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
+# To build with dom4j issue rpmbuild --with dom4j xom.spec
+
+%define with_dom4j %{?_with_dom4j:1}%{!?_with_dom4j:0}
+%define without_dom4j %{!?_with_dom4j:1}%{?_with_dom4j:0}
+
 Summary:        XML Pull Parser
 Name:           xom
 Version:        1.0
-Release:        3jpp.2%{?dist}
+Release:        3jpp.3%{?dist}
 Epoch:          0
 License:        LGPL
 URL:            http://www.xom.nu
@@ -51,10 +56,13 @@
 BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 BuildRequires:  icu4j
+%if %{with_dom4j}
+BuildRequires:  dom4j
+%endif
 BuildRequires:  xml-commons-apis
 
 BuildRequires:  tagsoup
-# JAXP implementation in libgcj
+# Use JAXP implementation in libgcj
 BuildRequires:  libgcj
 BuildRequires:  xml-commons-resolver
 BuildRequires:  servlet
@@ -109,6 +117,11 @@
 pushd lib2
 ln -sf $(build-classpath tagsoup) tagsoup-1.0rc1.jar
 ln -sf $(build-classpath xml-commons-resolver) resolver.jar
+
+%if %{with_dom4j}
+ln -sf $(build-classpath dom4j) dom4j.jar
+%endif
+
 ln -sf $(build-classpath servlet) servlet.jar
 popd
 
@@ -164,6 +177,9 @@
 %{_datadir}/%{name}-%{version}/xom-samples.jar
 
 %changelog
+* Mon Mar 12 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0-3jpp.3.fc7
+- Make build with dom4j optional (off by default)
+
 * Mon Mar 12 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.0-3jpp.2.fc7
 - Remove BR on classpathx-jaxp since libgcj includes the required bits