From a2e5b782d1066563ef0f9afb287ef914691c3c52 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: May 20 2020 11:02:25 +0000
Subject: import fltk-1.3.4-2.el7


---

diff --git a/SOURCES/fltk-1.3.4-fltk_config.patch b/SOURCES/fltk-1.3.4-fltk_config.patch
index 439d84c..5f33a0f 100644
--- a/SOURCES/fltk-1.3.4-fltk_config.patch
+++ b/SOURCES/fltk-1.3.4-fltk_config.patch
@@ -1,9 +1,8 @@
-diff --git a/fltk-config.in b/fltk-config.in
-index 265c5f5..ba73e92 100644
---- a/fltk-config.in
-+++ b/fltk-config.in
+diff -up fltk-1.3.4-1/fltk-config.in.fltk_config fltk-1.3.4-1/fltk-config.in
+--- fltk-1.3.4-1/fltk-config.in.fltk_config	2016-01-30 20:49:56.000000000 -0600
++++ fltk-1.3.4-1/fltk-config.in	2017-03-04 12:29:28.910316677 -0600
 @@ -44,8 +44,8 @@ CXX="@CXX@"
-
+ 
  # flags for C++ compiler:
  ARCHFLAGS="@ARCHFLAGS@"
 -CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
@@ -16,45 +15,44 @@ index 265c5f5..ba73e92 100644
 @@ -228,7 +228,7 @@ if test "$BINARY_DIR" != ""; then
      includes="-I$BINARY_DIR $includes"
  fi
-
+ 
 -if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32; then
 +if test "$libdir" != /usr/lib -a "$libdir" != /usr/lib32 -a "$libdir" != /usr/lib64; then
      libs=-L$libdir
  else
      libs=
 @@ -236,28 +236,28 @@ 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"
-+    LDLIBS="-lfltk_forms$SHAREDSUFFIX"
+     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="-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="-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="-lfltk_cairo$SHAREDSUFFIX $LDLIBS"
      LDSTATIC="$libdir/libfltk_cairo.a $CAIROLIBS $LDSTATIC"
  fi
-
+ 
 -LDLIBS="$DSOLINK $LDFLAGS $libs $LDLIBS"
 -LDSTATIC="$LDFLAGS $LDSTATIC"
 +LDLIBS="$libs $LDLIBS"
 +#LDSTATIC="$LDFLAGS $LDSTATIC"
-
+ 
  # Answer to user requests
  if test -n "$echo_help"; then
diff --git a/SPECS/fltk.spec b/SPECS/fltk.spec
index 7f27cfd..240ef47 100644
--- a/SPECS/fltk.spec
+++ b/SPECS/fltk.spec
@@ -2,7 +2,7 @@
 Summary:    C++ user interface toolkit
 Name:       fltk
 Version:    1.3.4
-Release:    1%{?dist}
+Release:    2%{?dist}
 
 # see COPYING (or http://www.fltk.org/COPYING.php ) for exceptions details
 License:    LGPLv2+ with exceptions
@@ -164,6 +164,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Thu Feb 20 2020 Jan Grulich <jgrulich@redhat.com> - 1.3.4-2
+- Do not drop linker flags for main library when --use-xxx option is used
+  Resolves: bz#1510482
+
 * Wed Feb 22 2017 Jan Grulich <jgrulich@redhat.com> - 1.3.4-1
 - Re-base to 1.3.4 (+ sync with Fedora)