From 1ccaa8a29f05f872f65d2f727d0dcab2a8ef6cf0 Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Fri, 27 May 2011 14:07:31 +0200
Subject: [PATCH] fltk-config: don't emit unneeded -l<library> flags (#708185)

Signed-off-by: Adam Tkac <atkac@redhat.com>
---
 fltk-1.3.0-rh708185.patch | 37 +++++++++++++++++++++++++++++++++++++
 fltk.spec                 |  7 ++++++-
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 fltk-1.3.0-rh708185.patch

diff --git a/fltk-1.3.0-rh708185.patch b/fltk-1.3.0-rh708185.patch
new file mode 100644
index 0000000..9be8375
--- /dev/null
+++ b/fltk-1.3.0-rh708185.patch
@@ -0,0 +1,37 @@
+This patch fixes https://bugzilla.redhat.com/show_bug.cgi?id=708185.
+
+When linking against dynamic libraries, we don't need to pass all
+required libraries (-lGL, -lpng, -lXinerama etc). Such libraries are only needed
+when performing static linking.
+
+diff -up fltk-1.3.0rc5/fltk-config.in.fltk_config fltk-1.3.0rc5/fltk-config.in
+--- fltk-1.3.0rc5/fltk-config.in.fltk_config	2011-01-01 01:10:38.000000000 +0100
++++ fltk-1.3.0rc5/fltk-config.in	2011-05-27 13:48:10.203763843 +0200
+@@ -240,23 +240,23 @@ fi
+ 
+ # Calculate needed libraries
+ LDSTATIC="$libdir/libfltk.a $LDLIBS"
+-LDLIBS="-lfltk$SHAREDSUFFIX $LDLIBS"
++LDLIBS="-lfltk$SHAREDSUFFIX"
+ 
+ if test x$use_forms = xyes; then
+     LDLIBS="-lfltk_forms$SHAREDSUFFIX $LDLIBS"
+     LDSTATIC="$libdir/libfltk_forms.a $LDSTATIC"
+ fi
+ if test x$use_gl = xyes; then
+-    LDLIBS="-lfltk_gl$SHAREDSUFFIX @GLLIB@ $LDLIBS"
++    LDLIBS="-lfltk_gl$SHAREDSUFFIX $LDLIBS"
+     LDSTATIC="$libdir/libfltk_gl.a @GLLIB@ $LDSTATIC"
+ fi
+ if test x$use_images = xyes; then
+-    LDLIBS="-lfltk_images$SHAREDSUFFIX $IMAGELIBS $LDLIBS"
++    LDLIBS="-lfltk_images$SHAREDSUFFIX $LDLIBS"
+     LDSTATIC="$libdir/libfltk_images.a $STATICIMAGELIBS $LDSTATIC"
+ fi
+ 
+ if test x$use_cairo = xyes; then
+-    LDLIBS="-lfltk_cairo$SHAREDSUFFIX $CAIROLIBS $LDLIBS"
++    LDLIBS="-lfltk_cairo$SHAREDSUFFIX $LDLIBS"
+     LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
+ fi
+ 
diff --git a/fltk.spec b/fltk.spec
index ad9509f..3da2f66 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -5,7 +5,7 @@
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.3.0
-Release:	0.1.%{?pre}%{?dist}
+Release:	0.2.%{?pre}%{?dist}
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:	LGPLv2+ with exceptions	
@@ -27,6 +27,7 @@ Patch1:        	fltk-1.1.9-fltk_config.patch
 Patch3: 	fltk-1.1.x-r5750-undefined.patch
 Patch5: 	fltk-1.1.8-fluid_desktop.patch
 Patch7:         fltk-1.1.9-scandir.patch
+Patch8:         fltk-1.3.0-rh708185.patch
 
 %if 0%{?rhel} > 4 || 0%{?fedora} > 4
 BuildRequires:  libICE-devel libSM-devel
@@ -92,6 +93,7 @@ Requires:	%{name}-devel = %{version}-%{release}
 %if 0%{?fedora} > 10
 %patch7 -p1 -b .gcc44
 %endif
+%patch8 -p1 -b .rh708185
 
 # verbose build output
 sed -i.silent '\,^.SILENT:,d' makeinclude.in
@@ -224,6 +226,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Fri May 27 2011 Adam Tkac <atkac redhat com> - 1.3.0-0.2.rc5
+- fltk-config: don't emit unneeded -l<library> flags (#708185)
+
 * Wed May 25 2011 Adam Tkac <atkac redhat com> - 1.3.0-0.1.rc5
 - update to 1.3.0rc5
 - patches no longer needed