From f46958fb375b7347dfcf9caf65af1c59d23e557d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Mar 05 2011 21:19:29 +0000
Subject: Fixed FTBFS issue (rhbz #661049)


Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

---

diff --git a/fvwm-0005-Explicitly-link-against-fontconfig.patch b/fvwm-0005-Explicitly-link-against-fontconfig.patch
new file mode 100644
index 0000000..4397014
--- /dev/null
+++ b/fvwm-0005-Explicitly-link-against-fontconfig.patch
@@ -0,0 +1,30 @@
+From 74beea206fe9550016cc8fc8e925906551617dd3 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 5 Mar 2011 23:29:33 +0300
+Subject: [PATCH 5/5] Explicitly link against fontconfig
+
+See rhbz #66104
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+---
+ configure.ac |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8b5cea5..b5ddb7f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -698,6 +698,10 @@ if test ! x"$with_xft" = xno; then
+     AM_CHECK_FC(1.0.1)
+     if test x"$no_fc" = x ; then
+       have_fontconfig=yes
++      fontconfig_CFLAGS=`$PKG_CONFIG --cflags fontconfig`
++      fontconfig_LIBS=`$PKG_CONFIG --libs fontconfig`
++      CFLAGS="$CFLAGS $fontconfig_CFLAGS"
++      LIBS="$LIBS $fontconfig_LIBS"
+     else
+       have_fontconfig=no
+       problem_xft=": Can't detect fontconfig >= 1.0.1"
+-- 
+1.7.4.1
+
diff --git a/fvwm.spec b/fvwm.spec
index 2fc644f..f25de6d 100644
--- a/fvwm.spec
+++ b/fvwm.spec
@@ -1,6 +1,6 @@
 Name:		fvwm
 Version:	2.5.30
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Highly configurable multiple virtual desktop window manager
 
 Group:		User Interface/X
@@ -15,7 +15,10 @@ Patch0:		fvwm-2.5.30-xdg-open.patch
 Patch1:		fvwm-2.5.30-mimeopen.patch
 Patch2:		fvwm-2.5.21-menu-generate.patch
 Patch3:		fvwm-2.5.30-more-mouse-buttons.patch
+Patch5:		fvwm-0005-Explicitly-link-against-fontconfig.patch
 
+BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	gettext libX11-devel libXt-devel libXext-devel libXinerama-devel libXpm-devel
 BuildRequires:	libXft-devel libXrender-devel
 BuildRequires:	libstroke-devel readline-devel libpng-devel fribidi-devel
@@ -47,6 +50,7 @@ and implement a virtual desktop.
 %patch1 -p1 -b .mimeopen
 %patch2 -p1 -b .menu-generate
 %patch3 -p1 -b .more-mouse-buttons
+%patch5 -p1 -b .implicit_dso_linking
 
 # Filter out false Perl provides
 cat << \EOF > %{name}-prov
@@ -71,6 +75,8 @@ chmod +x %{__perl_requires}
 
 
 %build
+aclocal --force
+autoreconf -ivf
 %configure
 make %{?_smp_mflags}
 
@@ -106,6 +112,9 @@ install -D -m0755 -p %{SOURCE2} \
 
 
 %changelog
+* Sat Mar 05 2011 Peter Lemenkov <lemenkov@gmail.com> - 2.5.30-4
+- Fixed FTBFS issue (rhbz #661049)
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.30-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild