[plplot] - Update to svn 12479 - Drop destdir patch fixed upstream - Build doxygen documentation - Put docume

[Orion Poplawski]

commit 4ca6272de55680ea2cdcfa7cc60517758d8a3ca7
Author: Orion Poplawski <orion at nwra.com>
Date:   Mon Aug 12 11:00:44 2013 -0600

    - Update to svn 12479
    - Drop destdir patch fixed upstream
    - Build doxygen documentation
    - Put documentation into separate -doc subpackage

 plplot-destdir.patch |   44 --------------------------------------------
 plplot.spec          |   32 ++++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 52 deletions(-)
---
diff --git a/plplot.spec b/plplot.spec
index 1f60e8b..0cbb394 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -22,26 +22,24 @@
 %bcond_without ocaml
 %endif
 
-%global svnver 12474
+%global svnver 12479
 
 Name:           plplot
 Version:        5.9.9
-Release:        18.svn%{svnver}%{?dist}
+Release:        19.svn%{svnver}%{?dist}
 Summary:        Library of functions for making scientific plots
 
 Group:          Applications/Engineering
 License:        LGPLv2+
 URL:            http://plplot.sourceforge.net/
-# svn export -r12474 svn://svn.code.sf.net/p/plplot/code/trunk plplot-5.9.9-svn12474
-# tar caf plplot-5.9.9-svn12474.tar.gz plplot-5.9.9-svn12474
+# svn export -r12479 svn://svn.code.sf.net/p/plplot/code/trunk plplot-5.9.9-svn12479
+# tar caf plplot-5.9.9-svn12479.tar.xz plplot-5.9.9-svn12479
 Source0:        http://downloads.sourceforge.net/plplot/%{name}-%{version}-svn%{svnver}.tar.xz
 # Add patch to pass octaveopts to octave tests
 Patch1:         plplot-octave.patch
 Patch2:         plplot-multiarch.patch
 # Change log10(x) to log(x,10) for lua 5.2
 Patch3:         plplot-lua52.patch
-# Undo upstream change to add DESTDIR to doc install path
-Patch4:         plplot-destdir.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -72,6 +70,7 @@ BuildRequires:  perl(PDL::Graphics::PLplot)
 %endif
 %if %{with doc}
 BuildRequires:  texlive, texinfo, openjade, jadetex, docbook2X, docbook-style-dsssl
+BuildRequires:  doxygen
 %endif
 %if %{with ocaml}
 BuildRequires:  ocaml
@@ -144,6 +143,16 @@ Requires:       qhull-devel, freetype-devel, libtool-ltdl-devel
 %{summary}.
 
 
+%package        doc
+Summary:        Documentation for PLplot
+Group:          Documentation
+BuildArch:      noarch
+Requires:       %{name} = %{version}-%{release}
+
+%description    doc
+%{summary}.
+
+
 %if %{with ada}
 %package        ada
 Summary:        Functions for scientific plotting with Ada
@@ -336,7 +345,6 @@ Requires:       pkgconfig
 %if 0%{?fedora} >= 20
 %patch3 -p1 -b .lua52
 %endif
-%patch4 -p0 -b .destdir
 
 
 %build
@@ -383,6 +391,7 @@ printenv
 %if %{with doc}
         -DXML_DECL:FILEPATH=/usr/share/sgml/xml.dcl \
         -DBUILD_DOC:BOOL=ON \
+        -DBUILD_DOX_DOC:BOOL=ON \
 %else
         -DPREBUILT_DOC:BOOL=ON \
 %endif
@@ -464,7 +473,6 @@ fi
 
 
 %files
-%{_docdir}/%{name}/
 %{_bindir}/pltek
 %{_bindir}/pstex2eps
 %{python_sitearch}/_plplotcmodule.so
@@ -548,6 +556,8 @@ fi
 %{_datadir}/plplot%{version}/examples/test_diff.sh
 %{_mandir}/man3/pl*.3*
 
+%files doc
+%{_docdir}/%{name}/
 
 %if %{with ada}
 %files ada
@@ -679,6 +689,12 @@ fi
 
 
 %changelog
+* Mon Aug 12 2013 Orion Poplawski <orion at cora.nwra.com> - 5.9.9-19.svn12479
+- Update to svn 12479
+- Drop destdir patch fixed upstream
+- Build doxygen documentation
+- Put documentation into separate -doc subpackage
+
 * Wed Aug 7 2013 Orion Poplawski <orion at cora.nwra.com> - 5.9.9-18.svn12474
 - Update to svn 12474
 - Add patch to revert doc DESTDIR change