From 4d6fd9fc99554baae1e30db5c84d5b26412efae6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 07 2010 18:57:20 +0000 Subject: don't build static fluid binary, should fix ftbfs/dso probs --- diff --git a/fltk-1.1.10-fluid_target.patch b/fltk-1.1.10-fluid_target.patch new file mode 100644 index 0000000..e18a8b8 --- /dev/null +++ b/fltk-1.1.10-fluid_target.patch @@ -0,0 +1,12 @@ +diff -up fltk-1.1.10/fluid/Makefile.fluid_target fltk-1.1.10/fluid/Makefile +--- fltk-1.1.10/fluid/Makefile.fluid_target 2008-12-29 14:21:29.000000000 -0600 ++++ fltk-1.1.10/fluid/Makefile 2010-12-07 12:54:32.836737792 -0600 +@@ -52,7 +52,7 @@ OBJECTS = $(CPPFILES:.cxx=.o) + + include ../makeinclude + +-all: $(FLUID) fluid$(EXEEXT) ++all: $(FLUID) + + fluid$(EXEEXT): $(OBJECTS) $(LIBNAME) $(FLLIBNAME) \ + $(IMGLIBNAME) diff --git a/fltk.spec b/fltk.spec index 29fbadb..ea76a0a 100644 --- a/fltk.spec +++ b/fltk.spec @@ -31,6 +31,8 @@ Patch5: fltk-1.1.8-fluid_desktop.patch Patch7: fltk-1.1.9-scandir.patch # use output of `pkg-config xft --libs` instead of just -lXft Patch8: fltk-1.1.10-pkgconfig_xft.patch +# only build the fluid binary we intend to install/use (ie, don't build both fluid, fluid-shared) +Patch9: fltk-1.1.10-fluid_target.patch %if 0%{?rhel} > 4 || 0%{?fedora} > 4 BuildRequires: libICE-devel libSM-devel @@ -99,6 +101,7 @@ Requires: %{name}-devel = %{version}-%{release} %patch7 -p1 -b .gcc44 %endif %patch8 -p1 -b .pkgconfig_xft +%patch9 -p1 -b .fluid_target # verbose build output sed -i.silent '\,^.SILENT:,d' makeinclude.in