From 2f787ea8df8d7c31cba570f3e9efffadb344f1dd Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Sun, 26 Jun 2016 19:16:55 -0500
Subject: [PATCH] 1.3.3-7

- -devel: Requires: pkgconfig(gl) pkgconfig(glu)
- cleaner DSOFLAGS
- fltk-config imposes internal build flags on the user (#1350069)
---
 ...nfig.patch => fltk-1.3.3-fltk_config.patch | 23 ++++++++++++++-----
 fltk.spec                                     | 17 +++++++++-----
 2 files changed, 28 insertions(+), 12 deletions(-)
 rename fltk-1.3.2-fltk_config.patch => fltk-1.3.3-fltk_config.patch (79%)

diff --git a/fltk-1.3.2-fltk_config.patch b/fltk-1.3.3-fltk_config.patch
similarity index 79%
rename from fltk-1.3.2-fltk_config.patch
rename to fltk-1.3.3-fltk_config.patch
index a55028e..efc23a7 100644
--- a/fltk-1.3.2-fltk_config.patch
+++ b/fltk-1.3.3-fltk_config.patch
@@ -1,6 +1,6 @@
-diff -up fltk-1.3.2/fltk-config.cmake.in.fltk_config fltk-1.3.2/fltk-config.cmake.in
---- fltk-1.3.2/fltk-config.cmake.in.fltk_config	2011-07-18 23:49:30.000000000 -0500
-+++ fltk-1.3.2/fltk-config.cmake.in	2014-06-25 07:37:23.149452668 -0500
+diff -up fltk-1.3.3/fltk-config.cmake.in.fltk_config fltk-1.3.3/fltk-config.cmake.in
+--- fltk-1.3.3/fltk-config.cmake.in.fltk_config	2013-04-06 11:15:17.000000000 -0500
++++ fltk-1.3.3/fltk-config.cmake.in	2016-06-26 18:34:24.369828419 -0500
 @@ -223,7 +223,7 @@ else
      includes=
  fi
@@ -46,9 +46,20 @@ diff -up fltk-1.3.2/fltk-config.cmake.in.fltk_config fltk-1.3.2/fltk-config.cmak
  
  # Answer to user requests
  if test -n "$echo_help"; then
-diff -up fltk-1.3.2/fltk-config.in.fltk_config fltk-1.3.2/fltk-config.in
---- fltk-1.3.2/fltk-config.in.fltk_config	2011-07-18 23:49:30.000000000 -0500
-+++ fltk-1.3.2/fltk-config.in	2014-06-25 07:37:05.886296078 -0500
+diff -up fltk-1.3.3/fltk-config.in.fltk_config fltk-1.3.3/fltk-config.in
+--- fltk-1.3.3/fltk-config.in.fltk_config	2013-04-05 10:28:43.000000000 -0500
++++ fltk-1.3.3/fltk-config.in	2016-06-26 18:35:37.891323957 -0500
+@@ -42,8 +42,8 @@ CXX="@CXX@"
+ 
+ # flags for C++ compiler:
+ ARCHFLAGS="@ARCHFLAGS@"
+-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
++CFLAGS="@LARGEFILE@ @PTHREAD_FLAGS@"
++CXXFLAGS="@LARGEFILE@ @PTHREAD_FLAGS@"
+ LDFLAGS="@LDFLAGS@"
+ LDLIBS="@LIBS@"
+ OPTIM="@OPTIM@"
 @@ -223,7 +223,7 @@ else
      includes=
  fi
diff --git a/fltk.spec b/fltk.spec
index fbe8f29..5a5b09d 100644
--- a/fltk.spec
+++ b/fltk.spec
@@ -9,7 +9,7 @@
 Summary:	C++ user interface toolkit
 Name:		fltk
 Version:	1.3.3
-Release:	6%{?dist}
+Release:	7%{?dist}
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:	LGPLv2+ with exceptions	
@@ -26,7 +26,7 @@ Source1: fltk-config.sh
 
 ## FIXME/TODO: upstream these asap -- Rex
 # add lib64 support, drop extraneous libs (bug #708185) and ldflags (#1112930)
-Patch1:        	fltk-1.3.2-fltk_config.patch
+Patch1:        	fltk-1.3.3-fltk_config.patch
 Patch5: 	fltk-1.1.8-fluid_desktop.patch
 
 ## upstream patches
@@ -56,6 +56,7 @@ It provides modern GUI functionality without the bloat, and supports
 Summary: Development files for %{name}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: libstdc++-devel
+Requires: pkgconfig(gl) pkgconfig(glu)
 Requires: pkgconfig(ice) pkgconfig(sm)
 Requires: pkgconfig(xft) pkgconfig(xt) pkgconfig(x11)
 %description devel
@@ -95,9 +96,8 @@ autoconf
 
 %build
 
-# using --with-optim, so unset CFLAGS/CXXFLAGS
-export CFLAGS=""
-export CXXFLAGS=""
+# set DSOFLAGS too, used to link shlibs (LDFLAGS used only for static libs)
+%{?__global_ldflags:DSOFLAGS="%{__global_ldflags}" ; export DSOFLAGS}
 
 %configure \
   --with-links \
@@ -109,7 +109,7 @@ export CXXFLAGS=""
   --enable-xinerama \
   --enable-xft
 
-make %{?_smp_mflags} DSOFLAGS="$LDFLAGS"
+make %{?_smp_mflags}
 
 
 %install
@@ -198,6 +198,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Sun Jun 26 2016 Rex Dieter <rdieter@fedoraproject.org> - 1.3.3-7
+- -devel: Requires: pkgconfig(gl) pkgconfig(glu)
+- cleaner DSOFLAGS
+- fltk_config.patch: imposes internal build flags on the user (#1350069)
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild