[gle] 4.2.4b docs include pdf support

[terjeros]

commit 356259a1adf52c78be7fae214899c3b4253cd952
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Tue Jan 17 22:39:37 2012 +0100

    4.2.4b
    docs
    include pdf support

 .gitignore              |    1 +
 gle-4.2.2-64bit.patch   |   34 ----------------------------------
 gle-4.2.4-include.patch |   26 --------------------------
 gle.spec                |   44 +++++++++++++++++++++++++-------------------
 sources                 |    3 +--
 5 files changed, 27 insertions(+), 81 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 57ff9bd..c5d1cd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ GLEusersguide.pdf
 /gle-graphics-4.2.3b-src.tar.gz
 /gle-graphics-4.2.3bf-src.tar.gz
 /gle-graphics-4.2.4f-src.tar.gz
+/gle-graphics-4.2.4bf-src.tar.gz
diff --git a/gle.spec b/gle.spec
index 7bb7853..b96c657 100644
--- a/gle.spec
+++ b/gle.spec
@@ -1,29 +1,24 @@
-%global mver   4.2.2
 %global oname  gle-graphics
 
 Summary:       Graphics Layout Engine
 Name:          gle
-Version:       4.2.4
-Release:       2%{?dist}
+Version:       4.2.4b
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.gle-graphics.org/
 Source0:       http://downloads.sourceforge.net/glx/gle-graphics-%{version}f-src.tar.gz
-Source1:       http://downloads.sourceforge.net/glx/gle-manual-%{mver}.pdf
-Source2:       http://downloads.sourceforge.net/glx/GLEusersguide.pdf
-# Add missing GLU include and library
-Patch0:        gle-4.2.4-include.patch
-
+Source1:       http://downloads.sourceforge.net/glx/GLEusersguide.pdf
 # Due to branching of docs and qgle
 Obsoletes:     %{name} < 4.2.2-8
 
-
 BuildRequires: cairo-devel
 BuildRequires: libstdc++-devel >= 3.0
 BuildRequires: libpng-devel
 BuildRequires: libtiff-devel
 BuildRequires: libjpeg-devel
 BuildRequires: ncurses-devel
+BuildRequires: poppler-glib-devel
 BuildRequires: zlib-devel
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: qt-devel >= 4.1.1
@@ -81,20 +76,30 @@ This package contains the user documentation.
 
 %prep
 %setup -q -n %{oname}-%{version}
-%patch0 -p1 -b .inc
 install -p -m 0644 %{SOURCE1} .
-install -p -m 0644 %{SOURCE2} .
 
 %build
 export CPPFLAGS="%{optflags}"
 export CXXFLAGS="%{optflags}"
-%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no --with-debug=yes --with-extrafonts=yes CPPFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
-make
-# %{?_smp_mflags} build fails.
+%configure --with-qt=%{_libdir}/qt4 \
+           --with-x                 \
+           --with-rpath=no          \
+           --with-debug=yes         \
+           --with-extrafonts=yes    \
+           --docdir=%{_docdir}/%{name}-doc-%{version} \
+           CPPFLAGS="%{optflags}"   \
+           CXXFLAGS="%{optflags}"
+make 
+# %{?_smp_mflags} build fails
+
+# docs
+make doc
 
 %install
 rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
+mv %{buildroot}/%{_docdir}/%{name}-doc-%{version}/gle-manual.pdf .
+rm -rf %{buildroot}/%{_docdir}/%{name}-doc-%{version}
 
 # Some fixes
 dos2unix LICENSE.txt
@@ -105,8 +110,7 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
-%doc README.txt LICENSE.txt src/gui/readme.txt 
-%doc gle-manual-%{mver}.pdf GLEusersguide.pdf
+%doc README.txt LICENSE.txt src/gui/readme.txt
 %{_bindir}/gle
 %{_bindir}/glebtool
 %{_bindir}/manip
@@ -120,11 +124,13 @@ rm -rf %{buildroot}
 
 %files doc
 %defattr(-, root, root, -)
-%doc LICENSE.txt gle-manual-%{mver}.pdf GLEusersguide.pdf
+%doc LICENSE.txt gle-manual.pdf GLEusersguide.pdf
 
 %changelog
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Tue Jan 17 2012 Terje Rosten <terje.rosten at ntnu.no> - 4.2.4b-1
+- 4.2.4b
+- docs
+- include pdf support
 
 * Mon Jan 02 2012 Terje Rosten <terje.rosten at ntnu.no> - 4.2.4-1
 - 4.2.4
diff --git a/sources b/sources
index d0e9464..bace280 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-1c582a64d3efd518db98b268cd0cda6f  gle-graphics-4.2.4f-src.tar.gz
-be72d14054ec32d6406330144d8868d3  gle-manual-4.2.2.pdf
 ab3f3787b96a602a486f5f39e72fc276  GLEusersguide.pdf
+acf8da59c10105c92c35c3e363d00bba  gle-graphics-4.2.4bf-src.tar.gz