[gipfel] Add gipfel-0.3.2-fltk.patch (Fix FTBS). Pass LIBS=-ljpeg to configure (Fix FTBS).

[corsepiu]

commit 37bbd867ed9a39e9f7e7b5255a533906c1b37d89
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Wed Jun 15 16:43:15 2011 +0200

    Add gipfel-0.3.2-fltk.patch (Fix FTBS).
    Pass LIBS=-ljpeg to configure (Fix FTBS).

 gipfel-0.3.2-fltk.patch |   38 ++++++++++++++++++++++++++++++++++++++
 gipfel.spec             |   11 +++++++++--
 2 files changed, 47 insertions(+), 2 deletions(-)
---
diff --git a/gipfel-0.3.2-fltk.patch b/gipfel-0.3.2-fltk.patch
new file mode 100644
index 0000000..53ac33e
--- /dev/null
+++ b/gipfel-0.3.2-fltk.patch
@@ -0,0 +1,38 @@
+diff -Naur gipfel-0.3.2.orig/src/PreviewOutputImage.cxx gipfel-0.3.2/src/PreviewOutputImage.cxx
+--- gipfel-0.3.2.orig/src/PreviewOutputImage.cxx	2009-05-28 21:43:07.000000000 +0200
++++ gipfel-0.3.2/src/PreviewOutputImage.cxx	2011-06-15 13:37:49.179522505 +0200
+@@ -8,8 +8,8 @@
+ #include <stdio.h>
+ #include <string.h>
+ 
+-#include <Fl/Fl.H>
+-#include <Fl/fl_draw.H>
++#include <FL/Fl.H>
++#include <FL/fl_draw.H>
+ 
+ #include "PreviewOutputImage.H"
+ 
+diff -Naur gipfel-0.3.2.orig/src/ScanImage.cxx gipfel-0.3.2/src/ScanImage.cxx
+--- gipfel-0.3.2.orig/src/ScanImage.cxx	2009-05-28 22:47:30.000000000 +0200
++++ gipfel-0.3.2/src/ScanImage.cxx	2011-06-15 13:37:49.181522493 +0200
+@@ -8,7 +8,7 @@
+ #include <stdio.h>
+ #include <math.h>
+ 
+-#include <Fl/Fl_Image.H>
++#include <FL/Fl_Image.H>
+ #include "ScanImage.H"
+ 
+ int
+diff -Naur gipfel-0.3.2.orig/src/Stitch.cxx gipfel-0.3.2/src/Stitch.cxx
+--- gipfel-0.3.2.orig/src/Stitch.cxx	2009-05-28 22:47:30.000000000 +0200
++++ gipfel-0.3.2/src/Stitch.cxx	2011-06-15 13:37:49.182522491 +0200
+@@ -12,7 +12,7 @@
+ 
+ #include <gsl/gsl_multifit.h>
+ 
+-#include <Fl/Fl.H>
++#include <FL/Fl.H>
+ 
+ #include "OutputImage.H"
+ #include "Stitch.H"
diff --git a/gipfel.spec b/gipfel.spec
index 23199c7..3f0eb1f 100644
--- a/gipfel.spec
+++ b/gipfel.spec
@@ -1,6 +1,6 @@
 Name:           gipfel
 Version:        0.3.2
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        A tool to find the names of mountains or POI on a picture
 
 Group:          Applications/System
@@ -10,6 +10,7 @@ Source0:        http://www.ecademix.com/JohannesHofmann/%{name}-%{version}.tar.g
 Source1:        %{name}.desktop
 Source2:        %{name}.png
 Patch0:		    %{name}-linking.patch
+Patch1:         %{name}-%{version}-fltk.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fltk-devel
@@ -34,6 +35,8 @@ gipfel can also generate (stitch) panorama images.
 %prep
 %setup -q
 %patch0 -p1 -b .linking
+%patch1 -p1 -b .fltk
+
 # Convert to utf-8
 for file in README; do
     mv $file timestamp
@@ -43,7 +46,7 @@ done
 
 
 %build
-%configure --docdir=%{_defaultdocdir}/%{name}-%{version}
+%configure --docdir=%{_defaultdocdir}/%{name}-%{version} LIBS="-ljpeg"
 make %{?_smp_mflags}
 
 
@@ -68,6 +71,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jun 16 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 0.3.2-10
+- Add gipfel-0.3.2-fltk.patch (Fix FTBS).
+- Pass LIBS=-ljpeg to configure (Fix FTBS).
+
 * Sun May 29 2011 Fabian Affolter <fabian at bernewireless.net> - 0.3.2-9
 - rebuild (fltk)