[gle/f16] Update to 4.2.3b.

Sat Oct 1 17:39:41 UTC 2011

commit 24c91f840243dfdd607bedd9e9b7808f145aa36e
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Sat Oct 1 20:39:28 2011 +0300

    Update to 4.2.3b.

 gle-4.2.3b-include.patch |   24 ++++++++++
 gle.spec                 |  109 ++++++++++++++++++++++++++++++++++++++--------
 sources                  |    2 +-
 3 files changed, 115 insertions(+), 20 deletions(-)
---

diff --git a/gle-4.2.3b-include.patch b/gle-4.2.3b-include.patch
new file mode 100644
index 0000000..01a7a42
--- /dev/null
+++ b/gle-4.2.3b-include.patch
@@ -0,0 +1,24 @@
+diff -up gle-graphics-4.2.3b/src/gui/3dviewer.cpp.orig gle-graphics-4.2.3b/src/gui/3dviewer.cpp
+--- gle-graphics-4.2.3b/src/gui/3dviewer.cpp.orig	2010-06-14 18:34:39.000000000 +0300
++++ gle-graphics-4.2.3b/src/gui/3dviewer.cpp	2011-10-01 12:45:02.223060075 +0300
+@@ -21,6 +21,7 @@
+ 
+ #include <QtGui>
+ #include <QtOpenGL>
++#include <GL/glu.h>
+ #include "3dviewer.h"
+ #include "../gle/surface/gsurface.h"
+ 
+diff -up gle-graphics-4.2.3b/src/gui/qgle.pro.in.orig gle-graphics-4.2.3b/src/gui/qgle.pro.in
+--- gle-graphics-4.2.3b/src/gui/qgle.pro.in.orig	2010-09-26 19:23:00.000000000 +0300
++++ gle-graphics-4.2.3b/src/gui/qgle.pro.in	2011-10-01 12:45:55.756792961 +0300
+@@ -173,6 +173,9 @@ win32 {
+ 	LIBS += -lgle-graphics- at GLE_VERSION@ -L../../build/bin/
+ }
+ 
++# Link against GLU library
++LIBS += -lGLU
++
+ # place the resulting QGLE executable in the "bin" subdirectory of "build"
+ DESTDIR = ../../build/bin
+ 
diff --git a/gle.spec b/gle.spec
index 88ac611..5eae9fd 100644
--- a/gle.spec
+++ b/gle.spec
@@ -3,19 +3,31 @@
 
 Summary:       Graphics Layout Engine
 Name:          gle
-Version:       4.2.2
-Release:       7%{?dist}
+Version:       4.2.3b
+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 libtiff-devel libjpeg-devel 
-BuildRequires: ncurses-devel zlib-devel xorg-x11-proto-devel
-BuildRequires: qt4-devel >= 4.1.1 cairo-devel
+BuildRequires: libpng-devel
+BuildRequires: libtiff-devel
+BuildRequires: libjpeg-devel
+BuildRequires: ncurses-devel
+BuildRequires: zlib-devel
+BuildRequires: xorg-x11-proto-devel
+BuildRequires: qt-devel >= 4.1.1
 BuildRequires: dos2unix
 Requires:      ghostscript
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -30,42 +42,101 @@ 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
+# 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
+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 user documentation.
+
 %prep
 %setup -q -n %{oname}-%{version}
 %patch0 -p1 -b .64bit
-%{__install} -p -m 0644 %{SOURCE1} .
-%{__install} -p -m 0644 %{SOURCE2} .
+%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}"
-%{__make}
+%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.
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} DESTDIR=%{buildroot} install
+rm -rf %{buildroot}
+make DESTDIR=%{buildroot} install
 
 # Some fixes
 dos2unix LICENSE.txt
-%{__rm} -f %{buildroot}%{_libdir}/pkgconfig/gle-graphics.pc
+rm -f %{buildroot}%{_libdir}/pkgconfig/gle-graphics.pc
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf %{buildroot}
 
 %files
 %defattr(-, root, root, -)
 %doc README.txt LICENSE.txt src/gui/readme.txt 
 %doc gle-manual-%{mver}.pdf GLEusersguide.pdf
-%{_bindir}/%{name}
-%{_bindir}/q%{name}
+%{_bindir}/gle
+%{_bindir}/glebtool
 %{_bindir}/manip
-%{_datadir}/%{oname}
-%{_mandir}/man1/%{name}*
-%{_libdir}/lib%{oname}-%{version}.so
+%{_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.
+
 * 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
 
diff --git a/sources b/sources
index b558d35..56a0cf8 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ff8a01cb92e5542c9c9c28ca8454a485  gle-graphics-4.2.2-src.tar.gz
+5884a1cbf7a0fe5d3a18a235d10f64a8  gle-graphics-4.2.3bf-src.tar.gz
 be72d14054ec32d6406330144d8868d3  gle-manual-4.2.2.pdf
 ab3f3787b96a602a486f5f39e72fc276  GLEusersguide.pdf
