rpms/plplot/devel .cvsignore, 1.13, 1.14 plplot.spec, 1.60, 1.61 sources, 1.13, 1.14

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/plplot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6239

Modified Files:
	.cvsignore plplot.spec sources 
Log Message:
Change to use %%bcond_with/without
New sources



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Sep 2008 23:04:59 -0000	1.13
+++ .cvsignore	13 Nov 2008 22:44:52 -0000	1.14
@@ -1,2 +1,3 @@
 plplot-5.9.0.tar.gz
 plplot-5.9.0-svn8752.patch
+plplot-5.9.0-svn8985.patch


Index: plplot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/plplot.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- plplot.spec	13 Nov 2008 21:09:49 -0000	1.60
+++ plplot.spec	13 Nov 2008 22:44:52 -0000	1.61
@@ -1,8 +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 1}
-%{!?with_octave:%define with_octave 1}
-# Set to bcond_with or use --without pdl to disable pdl build - needed to 
+# Set to bcond_with or use --without doc to disable doc build
+%bcond_without doc
+# Set to bcond_with or use --without octave to disable octave support
+%bcond_without octave
+# Set to bcond_with or use --without pdl to disable pdl tests - needed to 
 # bootstrap or for soname bumps in a plplot dependency
 %bcond_with pdl
 
@@ -30,7 +32,7 @@
 %else
 %define build_ada %{nil}
 %endif
-%if %{with_octave}
+%if %{with octave}
 BuildRequires:  octave-devel
 %define build_octave %{nil}
 %else
@@ -52,7 +54,7 @@
 %ifarch %{ix86} x86_64
 BuildRequires:  svgalib-devel
 %endif
-%if %{build_doc}
+%if %{with doc}
 BuildRequires:  texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
 %endif
 BuildRequires:  ocaml, ocaml-findlib, ocaml-camlidl-devel
@@ -190,7 +192,7 @@
 %{summary}.
 
 
-%if %{with_octave}
+%if %{with octave}
 %package        octave
 Summary:        Functions for scientific plotting with Octave
 Group:          Development/Libraries
@@ -297,7 +299,7 @@
 	-DPLD_vlt:BOOL=ON \
 	-DPLD_xterm:BOOL=ON \
 	-DPLD_wxwidgets:BOOL=ON \
-%if %{build_doc}
+%if %{with doc}
 	-DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
 	-DBUILD_DOC:BOOL=ON \
 %else
@@ -359,7 +361,7 @@
 
 %postun gnome -p /sbin/ldconfig
 
-%if %{with_octave}
+%if %{with octave}
 %post octave -p /sbin/ldconfig
 
 %postun octave -p /sbin/ldconfig
@@ -540,7 +542,7 @@
 %{_libdir}/ocaml/plplot/*.a
 %{_libdir}/ocaml/plplot/*.cmxa
 
-%if %{with_octave}
+%if %{with octave}
 %files octave
 %defattr(-,root,root,-)
 %{_datadir}/plplot_octave/
@@ -592,6 +594,7 @@
 * Thu Nov 13 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.9.0-2.svn8985
 - Update to svn revision 8985
 - Rebuild for libtool 2.2
+- Change to use %%bcond_with/without
 - Bootstrap build - without PDL
 
 * Fri Sep 5 2008 - Orion Poplawski <orion at cora.nwra.com> - 5.9.0-2.svn8752


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/plplot/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Sep 2008 23:04:59 -0000	1.13
+++ sources	13 Nov 2008 22:44:52 -0000	1.14
@@ -1,2 +1,2 @@
 bfaeba7a5f1ef83edc3787af04694539  plplot-5.9.0.tar.gz
-bb9c3727abd620637056fa6565547558  plplot-5.9.0-svn8752.patch
+f33bfd50fd463aa5dcc593ca9a006c35  plplot-5.9.0-svn8985.patch