rpms/gle/F-11 .cvsignore, 1.5, 1.6 gle.spec, 1.10, 1.11 sources, 1.5, 1.6

[terjeros]

Author: terjeros

Update of /cvs/extras/rpms/gle/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1809/F-11

Modified Files:
	.cvsignore gle.spec sources 
Log Message:
Sync with rawhide.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gle/F-11/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	2 Mar 2008 10:49:09 -0000	1.5
+++ .cvsignore	6 Dec 2009 21:15:47 -0000	1.6
@@ -1,2 +1,4 @@
-GLE-4.1.2-src.zip
-GLE-4.0.13-manual.pdf
+GLE-4.2.0-src.zip
+gle-manual-4.2.0.pdf
+GLEusersguide.pdf
+gle-graphics-4.2.1-src.tar.gz


Index: gle.spec
===================================================================
RCS file: /cvs/extras/rpms/gle/F-11/gle.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- gle.spec	24 Feb 2009 21:58:58 -0000	1.10
+++ gle.spec	6 Dec 2009 21:15:47 -0000	1.11
@@ -1,19 +1,20 @@
-%define mver 4.0.13
+%global mver   4.2.0
+%global oname  gle-graphics
 
 Summary:       Graphics Layout Engine
 Name:          gle
-Version:       4.1.2
-Release:       3%{?dist}
+Version:       4.2.1
+Release:       1%{?dist}
 License:       GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.gle-graphics.org/
-Source:        http://downloads.sourceforge.net/glx/GLE-%{version}-src.zip
-Source1:       http://www.cs.kuleuven.be/~jan/gle/GLE-%{mver}-manual.pdf
-Patch0:        gle-4.1.2-gcc44.patch
+Source0:       http://downloads.sourceforge.net/glx/gle4%20%28Current%20Active%20Version%29/%{version}/gle-graphics-%{version}-src.tar.gz
+Source1:       http://downloads.sourceforge.net/glx/gle-manual-%{mver}.pdf
+Source2:       http://downloads.sourceforge.net/glx/GLEusersguide.pdf
 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
+BuildRequires: qt4-devel >= 4.1.1 cairo-devel
 BuildRequires: dos2unix
 Requires:      ghostscript
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,13 +30,15 @@ simple looping structures. Current outpu
 JPEG, and PNG.
 
 %prep
-%setup -q -n gle4
-%patch0 -p1 
+%setup -q -n %{oname}-%{version}
 %{__install} -p -m 0644 %{SOURCE1} .
+%{__install} -p -m 0644 %{SOURCE2} .
 
 %build
-%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no
-%{__make} 
+export CPPFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+%configure --with-qt=%{_libdir}/qt4 --with-x --with-rpath=no --with-debug=yes CPPFLAGS="%{optflags}" CXXFLAGS="%{optflags}"
+%{__make}
 # %{?_smp_mflags} build fails.
 
 %install
@@ -51,15 +54,34 @@ dos2unix LICENSE.txt
 
 %files
 %defattr(-, root, root, -)
-%doc README.txt LICENSE.txt src/gui/readme.txt GLE-%{mver}-manual.pdf
+%doc README.txt LICENSE.txt src/gui/readme.txt 
+%doc gle-manual-4.2.0.pdf GLEusersguide.pdf
 %{_bindir}/%{name}
 %{_bindir}/q%{name}
 %{_bindir}/manip
-%{_datadir}/%{name}
+%{_datadir}/%{oname}
 %{_mandir}/man1/%{name}*
-%{_libdir}/lib%{name}-graphics-%{version}.so
+%{_libdir}/lib%{oname}-%{version}.so
 
 %changelog
+* Sun Dec  6 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.1-1
+- 4.2.1
+
+* Fri Jul 31 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.0-4
+- Rebuild
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.2.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue May 19 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.0-2
+- Build with cairo support 
+- Use correct optflags
+
+* Tue May 19 2009 Terje Rosten <terjeros at phys.ntnu.no> - 4.2.0-1
+- 4.2.0
+- Drop gcc43 patch now upstream
+- Add more documentation
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gle/F-11/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	2 Mar 2008 10:49:09 -0000	1.5
+++ sources	6 Dec 2009 21:15:47 -0000	1.6
@@ -1,2 +1,3 @@
-f689adc8294b657d37cc98f9ea788e81  GLE-4.1.2-src.zip
-98a9398f95d661bff49473561fec27f3  GLE-4.0.13-manual.pdf
+38f7a13e3a41cd386dc2d0a845cb86bc  gle-manual-4.2.0.pdf
+ab3f3787b96a602a486f5f39e72fc276  GLEusersguide.pdf
+6b483c2b262bfa4ad3f1a60226d05d51  gle-graphics-4.2.1-src.tar.gz