rpms/plplot/devel plplot.spec,1.31,1.32

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30395

Modified Files:
	plplot.spec 
Log Message:
Add build_doc conditional to test doc builds



Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- plplot.spec	16 Apr 2007 17:11:46 -0000	1.31
+++ plplot.spec	12 Jul 2007 19:26:38 -0000	1.32
@@ -1,9 +1,10 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?octave_api: %define octave_api %(octave-config -p API_VERSION || echo 0)}
+%{!?build_doc:%define build_doc 0}
 
 Name:           plplot
 Version:        5.7.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
@@ -28,6 +29,9 @@
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
 %endif
+%if %{build_doc}
+BuildRequires:  docbook2X
+%endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 Requires:       freefont
@@ -183,7 +187,6 @@
 export CXXFLAGS="$RPM_OPT_FLAGS"
 export FFLAGS="$RPM_OPT_FLAGS"
 %cmake .. \
-        -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
 	-DENABLE_ada:BOOL=ON \
 	-DPL_FREETYPE_FONT_PATH:PATH="/usr/share/fonts/freefont" \
 	-DPLD_aqt:BOOL=ON \
@@ -205,8 +208,12 @@
 	-DPLD_vlt:BOOL=ON \
 	-DPLD_xterm:BOOL=ON \
 	-DPLD_wxwidgets:BOOL=ON \
+%if %{build_doc}
+	-DBUILD_DOC:BOOL=ON \
+%else
 	-DPREBUILT_DOC:BOOL=ON \
-	-DBUILD_TEST=ON
+%endif
+	-DBUILD_TEST:BOOL=ON
 make VERBOSE=1
 
 
@@ -441,6 +448,9 @@
 %{_libdir}/pkgconfig/plplotd-wxwidgets.pc
 
 %changelog
+* Thu Jul 12 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-3
+- Add build_doc conditional to test doc builds
+
 * Mon Apr 16 2007 - Orion Poplawski <orion at cora.nwra.com> - 5.7.3-2
 - Use cmake macros