[MagicPoint] Enable m17n-lib support (rhbz#920308)

[Hans de Goede]

commit 8f3787d7f4642321eb85ce56031cc79e3b85987d
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Mon Mar 11 20:19:27 2013 +0100

    Enable m17n-lib support (rhbz#920308)

 MagicPoint.spec             |   14 ++++++++++----
 magicpoint-1.13a-m17n.patch |   11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)
---
diff --git a/MagicPoint.spec b/MagicPoint.spec
index bc82923..437c40e 100644
--- a/MagicPoint.spec
+++ b/MagicPoint.spec
@@ -1,6 +1,6 @@
 Name:           MagicPoint
 Version:        1.13a
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        X based presentation software
 Group:          Applications/Productivity
 License:        BSD
@@ -11,8 +11,10 @@ Patch1:         magicpoint-1.11b-64bit.patch
 Patch2:         magicpoint-1.11b-embed.patch
 Patch3:         magicpoint-1.13a-gcc-warnings.patch
 Patch4:         magicpoint-1.13a-xwintoppm.patch
-BuildRequires:  giflib-devel libpng-devel libmng-devel fontconfig-devel imake
-BuildRequires:  imlib-devel libXmu-devel libXft-devel bison flex perl sharutils
+Patch5:         magicpoint-1.13a-m17n.patch
+BuildRequires:  giflib-devel libpng-devel libmng-devel fontconfig-devel 
+BuildRequires:  imlib-devel libXmu-devel libXft-devel m17n-lib-devel
+BuildRequires:  imake bison flex perl sharutils
 Requires:       sharutils
 Obsoletes:      mgp < %{version}-%{release}, magicpoint < %{version}-%{release}
 Provides:       mgp = %{version}-%{release}, magicpoint = %{version}-%{release}
@@ -30,12 +32,13 @@ create presentation files quickly with your favorite editor.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 
 %build
 RPM_OPT_FLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign -Wno-unused-variable -Wno-unused-but-set-variable -Wno-unused-function"
 export CFLAGS="$RPM_OPT_FLAGS"
-%configure --enable-locale --enable-xft2 --enable-gif --enable-imlib
+%configure --enable-locale --enable-xft2 --enable-gif --enable-imlib --with-m17n-lib
 xmkmf -a
 # LIBDIR is used by the makefile to determine where to install data files
 make CDEBUGFLAGS="$RPM_OPT_FLAGS" LIBDIR=%{_datadir}
@@ -57,6 +60,9 @@ rm sample/.cvsignore sample/*akefile*
 
 
 %changelog
+* Mon Mar 11 2013 Hans de Goede <hdegoede at redhat.com> - 1.13a-6
+- Enable m17n-lib support (rhbz#920308)
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.13a-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/magicpoint-1.13a-m17n.patch b/magicpoint-1.13a-m17n.patch
new file mode 100644
index 0000000..5c0549a
--- /dev/null
+++ b/magicpoint-1.13a-m17n.patch
@@ -0,0 +1,11 @@
+--- magicpoint-1.13a/configure.m17n	2007-12-28 21:31:26.000000000 +0100
++++ magicpoint-1.13a/configure	2013-03-11 20:09:28.490225101 +0100
+@@ -7435,7 +7435,7 @@ fi
+ _ACEOF
+ 
+ 		OPTFLAGS="$OPTFLAGS `m17n-config X --cflags`"
+-		LIBS="$LIBS `m17n-config X --libs` -lm17n-core"
++		LIBS="$LIBS `m17n-config X --libs` -lm17n-core -lfontconfig"
+ 	fi
+ fi
+