diff --git a/m17n-lib-1.6.1-multilib.patch b/m17n-lib-1.6.1-multilib.patch new file mode 100644 index 0000000..e441b0b --- /dev/null +++ b/m17n-lib-1.6.1-multilib.patch @@ -0,0 +1,53 @@ +--- 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@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@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;; + *) diff --git a/m17n-lib.spec b/m17n-lib.spec index b24fb2e..618e96c 100644 --- a/m17n-lib.spec +++ b/m17n-lib.spec @@ -7,13 +7,14 @@ Name: m17n-lib Version: 1.6.1 -Release: 1%{?dist} +Release: 2%{?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.6.1-multilib.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: m17n-db-devel >= 1.6.0 %if %{with anthy} @@ -79,9 +80,12 @@ Ispell module for m17n input. %prep %setup -q +%patch0 -p0 %build %configure --disable-rpath --disable-static %{!?with_gui:--without-gui} +sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool make @@ -144,6 +148,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 07 2010 Parag Nemade - 1.6.1-2 +- Resolves: rh#602029:-m17n-lib-devel multilib conflict +- Fix rpmlint rpath error. + * Tue Apr 27 2010 Parag Nemade - 1.6.1-1 - update to new upstream release 1.6.1