[m17n-lib] Fix m17n-config not working on non x86_* archs (rh#921189)

[Hans de Goede]

commit 5af1bfbf563c4cd5ca3b8be1d007480c9b274643
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Thu Mar 14 09:25:29 2013 +0100

    Fix m17n-config not working on non x86_* archs (rh#921189)

 m17n-lib-1.6.1-multilib.patch |   28 ++++++++--------------------
 m17n-lib.spec                 |    7 +++++--
 2 files changed, 13 insertions(+), 22 deletions(-)
---
diff --git a/m17n-lib-1.6.1-multilib.patch b/m17n-lib-1.6.1-multilib.patch
index d301931..0f7c6d4 100644
--- a/m17n-lib-1.6.1-multilib.patch
+++ b/m17n-lib-1.6.1-multilib.patch
@@ -1,6 +1,7 @@
---- m17n-config.in.old	2007-11-22 12:28:52.000000000 +0530
-+++ m17n-config.in	2010-07-01 14:35:00.000000000 +0530
-@@ -64,17 +64,25 @@ else
+diff -up m17n-lib-1.6.4/m17n-config.in.multi m17n-lib-1.6.4/m17n-config.in
+--- m17n-lib-1.6.4/m17n-config.in.multi	2012-04-23 02:16:56.000000000 +0200
++++ m17n-lib-1.6.4/m17n-config.in	2013-03-14 09:17:32.061122801 +0100
+@@ -64,17 +64,15 @@ else
    LIBNAME="$LIBNAME$LIBSHELL$LIBFLT$LIBGUI"
  fi
  
@@ -17,35 +18,22 @@
 -    echo "${LIBNAME}"
 -  fi;;
 -
-+  case $platform in
-+   "i686")
-+     echo "${LIBNAME}"
-+     ;;
-+   "x86_64")
-+    echo "-L/usr/lib64 ${LIBNAME}"
-+    ;;
-+   *)
-+    echo "Unknown platform"
-+    ;;
-+  esac;;
++  echo "${LIBNAME}";;
 +  
  --cflags)
    if test "@includedir@" != "/usr/include"; then
      echo "-I at includedir@"
-@@ -82,7 +90,17 @@ case $1 in
+@@ -82,7 +80,14 @@ case $1 in
  
  --libtool)
    for name in $LIBTOOLNAME; do
 -    echo -n "@libdir@/lib${name}.la "
 +   case $platform in
-+    "i686")
-+      echo -n "/usr/lib/lib${name}.la "
-+      ;;
-+    "x86_64")
++    x86_64|ppc64|s390x|sparc64)
 +      echo -n "/usr/lib64/lib${name}.la "
 +      ;;
 +    *)
-+      echo "Unknown platform"
++      echo -n "/usr/lib/lib${name}.la "
 +      ;;
 +   esac
    done;
diff --git a/m17n-lib.spec b/m17n-lib.spec
index 432b308..bff876d 100644
--- a/m17n-lib.spec
+++ b/m17n-lib.spec
@@ -3,7 +3,7 @@
 
 Name:    m17n-lib
 Version:  1.6.4
-Release:  6%{?dist}
+Release:  7%{?dist}
 Summary:  Multilingual text library
 
 Group:    System Environment/Libraries
@@ -59,7 +59,7 @@ Tools to test M17n GUI widget library.
 
 %prep
 %setup -q 
-%patch0 -p0
+%patch0 -p1
 
 %build
 %configure --disable-rpath --disable-static
@@ -112,6 +112,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_libdir}/libm17n-gui.so.*
 
 %changelog
+* Thu Mar 14 2013 Hans de Goede <hdegoede at redhat.com> - 1.6.4-7
+- Fix m17n-config not working on non x86_* archs (rh#921189)
+
 * Mon Mar 11 2013 Parag Nemade <pnemade AT redhat DOT com> - 1.6.4-6
 - Resolves:rh#907488 - shell syntax error in m17n-config