rpms/m17n-lib/F-13 m17n-lib-1.5.5-multilib.patch, NONE, 1.1 m17n-lib.spec, 1.28, 1.29

[pnemade]

Author: pnemade

Update of /cvs/pkgs/rpms/m17n-lib/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28766

Modified Files:
	m17n-lib.spec 
Added Files:
	m17n-lib-1.5.5-multilib.patch 
Log Message:
* Thu Jul 01 2010 Parag Nemade <pnemade at redhat.com> - 1.5.5-3
- Resolves: rh#602029:-m17n-lib-devel multilib conflict



m17n-lib-1.5.5-multilib.patch:
 m17n-config.in |   32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

--- NEW FILE m17n-lib-1.5.5-multilib.patch ---
--- 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
   LIBNAME="$LIBNAME$LIBSHELL$LIBFLT$LIBGUI"
 fi
 
+platform=`uname -m`
+
 case $1 in
 --version)
   echo "@PACKAGE_VERSION@";;
 
 --libs)
-  if test "@libdir@" != "/usr/lib"; then
-    echo "-L at libdir@ ${LIBNAME}"
-  else
-    echo "${LIBNAME}"
-  fi;;
-
+  case $platform in
+   "i686")
+     echo "${LIBNAME}"
+     ;;
+   "x86_64")
+    echo "-L/usr/lib64 ${LIBNAME}"
+    ;;
+   *)
+    echo "Unknown platform"
+    ;;
+  esac
+  
 --cflags)
   if test "@includedir@" != "/usr/include"; then
     echo "-I at includedir@"
@@ -82,7 +90,17 @@ 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")
+      echo -n "/usr/lib64/lib${name}.la "
+      ;;
+    *)
+      echo "Unknown platform"
+      ;;
+   esac
   done;
   echo;;
 *)


Index: m17n-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/m17n-lib/F-13/m17n-lib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- m17n-lib.spec	23 Dec 2009 09:44:36 -0000	1.28
+++ m17n-lib.spec	1 Jul 2010 10:22:16 -0000	1.29
@@ -7,13 +7,14 @@
 
 Name:    m17n-lib
 Version:  1.5.5
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary:  Multilingual text library
 
 Group:    System Environment/Libraries
 License:  LGPLv2
 URL:    http://www.m17n.org/m17n-lib/index.html
 Source0:  http://www.m17n.org/m17n-lib-download/%{name}-%{version}.tar.gz
+Patch0:  m17n-lib-1.5.5-multilib.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  m17n-db-devel = %{version}
 %if %{with anthy}
@@ -85,6 +86,7 @@ Ispell module for m17n input.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
 %configure --disable-static %{!?with_gui:--without-gui}
@@ -154,6 +156,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 01 2010 Parag Nemade <pnemade at redhat.com> - 1.5.5-3
+- Resolves: rh#602029:-m17n-lib-devel multilib conflict 
+
 * Wed Dec 23 2009 Jens Petersen <petersen at redhat.com> - 1.5.5-2
 - add bcond for otf, anthy, and gui
 - subpackage flt for emacs, etc