[gle] Enable extra fonts, fix FTBFS, branch QT frontend.

[Jussi Lehtola]

commit 163d0368bacb95bf502cd801a10243af2c853f31
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sat Oct 1 18:11:52 2011 +0300

    Enable extra fonts, fix FTBFS, branch QT frontend.

 gle.spec |   53 +++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 45 insertions(+), 8 deletions(-)
---
diff --git a/gle.spec b/gle.spec
index a34ea9d..5eae9fd 100644
--- a/gle.spec
+++ b/gle.spec
@@ -4,14 +4,21 @@
 Summary:       Graphics Layout Engine
 Name:          gle
 Version:       4.2.3b
-Release:       1%{?dist}
+Release:       3%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.gle-graphics.org/
-Source0:       http://downloads.sourceforge.net/glx/gle-graphics-%{version}-src.tar.gz
+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
 Patch0:        %{name}-4.2.2-64bit.patch
+# Add missing GLU include and library
+Patch1:        %{name}-4.2.3b-include.patch
+
+# Due to branching of docs and qgle
+Obsoletes:     %{name} < 4.2.2-8
+
+
 BuildRequires: cairo-devel
 BuildRequires: libstdc++-devel >= 3.0
 BuildRequires: libpng-devel
@@ -35,10 +42,31 @@ a graph. Complex pictures can be drawn with user-defined subroutines and
 simple looping structures. Current output formats include EPS, PS, PDF,
 JPEG, and PNG.
 
+%package -n qgle
+Summary:       QT frontend to GLE
+Group:         Applications/Multimedia
+Requires:      %{name}%{?_isa} = %{version}-%{release}
+# Due to branching of docs and qgle
+Obsoletes:     %{name} < 4.2.2-8
+
+%description -n qgle
+GLE (Graphics Layout Engine) is a high-quality graphics package for
+scientists, combining a user-friendly scripting language with a full
+range of facilities for producing publication-quality graphs, diagrams,
+posters and slides. GLE provides LaTeX quality fonts together with a
+flexible graphics module which allows the user to specify any feature of
+a graph. Complex pictures can be drawn with user-defined subroutines and
+simple looping structures. Current output formats include EPS, PS, PDF,
+JPEG, and PNG.
+
+This package contains the QT frontend.
+
 %package doc
-Summary:	User documentation for GLE
-Group:		Documentation
-BuildArch:	noarch
+Summary:       User documentation for GLE
+Group:         Documentation
+BuildArch:     noarch
+# Due to branching of docs and qgle
+Obsoletes:     %{name} < 4.2.2-8
 
 %description doc
 GLE (Graphics Layout Engine) is a high-quality graphics package for
@@ -55,13 +83,14 @@ This package contains the user documentation.
 %prep
 %setup -q -n %{oname}-%{version}
 %patch0 -p1 -b .64bit
+%patch1 -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 CPPFLAGS="%{optflags}" 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.
 
@@ -82,23 +111,31 @@ rm -rf %{buildroot}
 %doc gle-manual-%{mver}.pdf GLEusersguide.pdf
 %{_bindir}/gle
 %{_bindir}/glebtool
-%{_bindir}/qgle
 %{_bindir}/manip
 %{_datadir}/gle-graphics
 %{_mandir}/man1/gle.1*
 %{_libdir}/libgle-graphics-%{version}.so
 
+%files -n qgle
+%defattr(-, root, root, -)
+%{_bindir}/qgle
+
 %files doc
 %defattr(-, root, root, -)
 %doc LICENSE.txt gle-manual-%{mver}.pdf GLEusersguide.pdf
 
 %changelog
+* Sat Oct 1 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.2.3b-3
+- Enable extra fonts.
+- Fix FTBFS on rawhide.
+- Branch QT frontend into separate package.
+
 * Fri Sep 30 2011 Terje Rosten <terje.rosten at ntnu.no> - 4.2.3b-2
 - Fix src url
 - qt4 is qt
 
 * Fri Sep 30 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 4.2.3b-1
-- Update to 4.2.3
+- Update to 4.2.3.
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild