[gle] Fix src url qt4 is qt

[terjeros]

commit 89977a73ee7fddbfd0e3aff0c21310a4d9739d69
Author: Terje Røsten <terje.rosten at ntnu.no>
Date:   Fri Sep 30 18:05:29 2011 +0200

    Fix src url
    qt4 is qt

 .gitignore |    1 +
 gle.spec   |   68 +++++++++++++++++++++++++++++++++++++++++++++---------------
 sources    |    2 +-
 3 files changed, 53 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6acf99e..aed92ed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 gle-graphics-4.2.2-src.tar.gz
 gle-manual-4.2.2.pdf
 GLEusersguide.pdf
+/gle-graphics-4.2.3b-src.tar.gz
diff --git a/gle.spec b/gle.spec
index 88ac611..a34ea9d 100644
--- a/gle.spec
+++ b/gle.spec
@@ -3,8 +3,8 @@
 
 Summary:       Graphics Layout Engine
 Name:          gle
-Version:       4.2.2
-Release:       7%{?dist}
+Version:       4.2.3b
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.gle-graphics.org/
@@ -12,10 +12,15 @@ Source0:       http://downloads.sourceforge.net/glx/gle-graphics-%{version}-src.
 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
+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 +35,71 @@ 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 doc
+Summary:	User documentation for GLE
+Group:		Documentation
+BuildArch:	noarch
+
+%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} .
+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}
+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}/qgle
 %{_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 doc
+%defattr(-, root, root, -)
+%doc LICENSE.txt gle-manual-%{mver}.pdf GLEusersguide.pdf
 
 %changelog
+* 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..0471bab 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-ff8a01cb92e5542c9c9c28ca8454a485  gle-graphics-4.2.2-src.tar.gz
+8a547127586fa554963012593b9dd62e  gle-graphics-4.2.3b-src.tar.gz
 be72d14054ec32d6406330144d8868d3  gle-manual-4.2.2.pdf
 ab3f3787b96a602a486f5f39e72fc276  GLEusersguide.pdf