From f2845557690b0a1bbc4dc724aeb187efee2d2d2d Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <andreas.bierfert@lowlatency.de>
Date: Dec 10 2010 09:31:12 +0000
Subject: - 1.1.1-6

- add -lfontconfig (#660981)

---

diff --git a/fluxbox-dso.patch b/fluxbox-dso.patch
new file mode 100644
index 0000000..0f4f7ba
--- /dev/null
+++ b/fluxbox-dso.patch
@@ -0,0 +1,80 @@
+diff -up fluxbox-1.1.1/src/Makefile.am.dso fluxbox-1.1.1/src/Makefile.am
+--- fluxbox-1.1.1/src/Makefile.am.dso	2010-12-08 23:04:57.000000000 +0100
++++ fluxbox-1.1.1/src/Makefile.am	2010-12-08 23:05:39.000000000 +0100
+@@ -156,4 +156,4 @@ fluxbox_SOURCES = AtomHandler.hh ArrowBu
+ 	${REMEMBER_SOURCE} ${TOOLBAR_SOURCE}
+ 
+ 
+-LDADD=FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT)
++LDADD=-lfontconfig FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT)
+diff -up fluxbox-1.1.1/src/Makefile.in.dso fluxbox-1.1.1/src/Makefile.in
+--- fluxbox-1.1.1/src/Makefile.in.dso	2010-12-08 23:05:48.000000000 +0100
++++ fluxbox-1.1.1/src/Makefile.in	2010-12-08 23:06:30.000000000 +0100
+@@ -367,7 +367,7 @@ fluxbox_SOURCES = AtomHandler.hh ArrowBu
+ 	${newwmspec_SOURCE} ${gnome_SOURCE} \
+ 	${REMEMBER_SOURCE} ${TOOLBAR_SOURCE}
+ 
+-LDADD = FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT)
++LDADD = -lfontconfig FbTk/libFbTk.a FbTk/LogicCommands.o defaults.$(OBJEXT)
+ all: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
+diff -up fluxbox-1.1.1/util/fbrun/Makefile.am.dso fluxbox-1.1.1/util/fbrun/Makefile.am
+--- fluxbox-1.1.1/util/fbrun/Makefile.am.dso	2010-12-08 23:16:58.000000000 +0100
++++ fluxbox-1.1.1/util/fbrun/Makefile.am	2010-12-08 23:17:33.000000000 +0100
+@@ -2,7 +2,7 @@ FLUXBOX_SRC_DIR=	../../src/
+ INCLUDES= 		-I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
+ bin_PROGRAMS= 		fbrun
+ fbrun_SOURCES= 		FbRun.hh FbRun.cc main.cc fbrun.xpm
+-fbrun_LDADD=		${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
++fbrun_LDADD=		-lfontconfig ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
+ 
+ ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a:
+-	cd ${FLUXBOX_SRC_DIR}FbTk && make
+\ No newline at end of file
++	cd ${FLUXBOX_SRC_DIR}FbTk && make
+diff -up fluxbox-1.1.1/util/fbrun/Makefile.in.dso fluxbox-1.1.1/util/fbrun/Makefile.in
+--- fluxbox-1.1.1/util/fbrun/Makefile.in.dso	2010-12-08 23:17:08.000000000 +0100
++++ fluxbox-1.1.1/util/fbrun/Makefile.in	2010-12-08 23:17:50.000000000 +0100
+@@ -179,7 +179,7 @@ top_srcdir = @top_srcdir@
+ FLUXBOX_SRC_DIR = ../../src/
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
+ fbrun_SOURCES = FbRun.hh FbRun.cc main.cc fbrun.xpm
+-fbrun_LDADD = ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
++fbrun_LDADD = -lfontconfig ${FLUXBOX_SRC_DIR}FbTk/libFbTk.a
+ all: all-am
+ 
+ .SUFFIXES:
+diff -up fluxbox-1.1.1/util/Makefile.am.dso fluxbox-1.1.1/util/Makefile.am
+--- fluxbox-1.1.1/util/Makefile.am.dso	2008-06-06 11:15:55.000000000 +0200
++++ fluxbox-1.1.1/util/Makefile.am	2010-12-08 23:35:11.000000000 +0100
+@@ -4,10 +4,10 @@ INCLUDES= 		-I$(top_srcdir)/src -I$(top_
+ bin_SCRIPTS= 		fbsetbg fluxbox-generate_menu startfluxbox
+ bin_PROGRAMS=		fbsetroot fluxbox-update_configs fluxbox-remote
+ fbsetroot_SOURCES=	fbsetroot.cc fbsetroot.hh
+-fbsetroot_LDADD=../src/FbRootWindow.o ../src/FbAtoms.o \
++fbsetroot_LDADD= -lfontconfig ../src/FbRootWindow.o ../src/FbAtoms.o \
+ 			../src/FbTk/libFbTk.a
+ fluxbox_update_configs_SOURCES=	fluxbox-update_configs.cc
+-fluxbox_update_configs_LDADD=	../src/defaults.o ../src/Resources.o \
++fluxbox_update_configs_LDADD= -lfontconfig ../src/defaults.o ../src/Resources.o \
+ 			../src/FbTk/libFbTk.a
+ fluxbox_remote_SOURCES=	fluxbox-remote.cc
+ 
+diff -up fluxbox-1.1.1/util/Makefile.in.dso fluxbox-1.1.1/util/Makefile.in
+--- fluxbox-1.1.1/util/Makefile.in.dso	2008-09-17 18:16:23.000000000 +0200
++++ fluxbox-1.1.1/util/Makefile.in	2010-12-08 23:35:31.000000000 +0100
+@@ -206,11 +206,11 @@ SUBDIRS = fbrun
+ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
+ bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
+ fbsetroot_SOURCES = fbsetroot.cc fbsetroot.hh
+-fbsetroot_LDADD = ../src/FbRootWindow.o ../src/FbAtoms.o \
++fbsetroot_LDADD = -lfontconfig ../src/FbRootWindow.o ../src/FbAtoms.o \
+ 			../src/FbTk/libFbTk.a
+ 
+ fluxbox_update_configs_SOURCES = fluxbox-update_configs.cc
+-fluxbox_update_configs_LDADD = ../src/defaults.o ../src/Resources.o \
++fluxbox_update_configs_LDADD = -lfontconfig ../src/defaults.o ../src/Resources.o \
+ 			../src/FbTk/libFbTk.a
+ 
+ fluxbox_remote_SOURCES = fluxbox-remote.cc
diff --git a/fluxbox.spec b/fluxbox.spec
index 7a509eb..b4dca91 100644
--- a/fluxbox.spec
+++ b/fluxbox.spec
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        1.1.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -13,6 +13,7 @@ Source3:        fluxbox.desktop
 Source4:        fluxbox-xdg-menu.py
 Patch0:         fluxbox-startfluxbox-pulseaudio.patch
 Patch1:         fluxbox-gcc43.patch
+Patch2:         fluxbox-dso.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
 BuildRequires:  imlib2-devel
@@ -57,6 +58,7 @@ Enable pulseaudio support.
 %setup -q
 %patch0
 %patch1 -p1 -b .gcc43
+%patch2 -p1 -b .dso
 
 %build
 %configure      --enable-xft \
@@ -102,6 +104,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/fluxbox-pulseaudio
 
 %changelog
+* Wed Dec 08 2010 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 1.1.1-6
+- add -lfontconfig (#660981)
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.1.1-5
 - Convert specfile to UTF-8.