rpms/uim/devel uim-0.4.6-multilib.patch, NONE, 1.1 uim.spec, 1.10, 1.11

[Akira Tagoh (tagoh)]

Author: tagoh

Update of /cvs/extras/rpms/uim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6884

Modified Files:
	uim.spec 
Added Files:
	uim-0.4.6-multilib.patch 
Log Message:
* Mon May 16 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-3
- uim-0.4.6-multilib.patch: applied to fix a build issue for
  libquiminputcontextplugin.so. (John Thacker, #156880)

uim-0.4.6-multilib.patch:

--- NEW FILE uim-0.4.6-multilib.patch ---
diff -ur uim-0.4.6.orig/configure.ac uim-0.4.6/configure.ac
--- uim-0.4.6.orig/configure.ac	2005-05-11 11:46:09.000000000 -0400
+++ uim-0.4.6/configure.ac	2005-05-11 11:46:26.000000000 -0400
@@ -613,7 +613,7 @@
     fi
 
     LDFLAGS=$_SAVE_LDFLAGS
-    QT_LIBS="-L/usr/X11R6/lib $QT_LDFLAGS $QT_LIB -lXext -lX11"
+    QT_LIBS="$X_LIBS $QT_LDFLAGS $QT_LIB -lXext -lX11"
 
     _SAVE_CXXFLAGS=$CXXFLAGS
     _SAVE_LIBS=$LIBS


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- uim.spec	6 May 2005 05:37:29 -0000	1.10
+++ uim.spec	16 May 2005 10:07:53 -0000	1.11
@@ -5,12 +5,13 @@
 Summary:	A multilingual input method library
 Name:		uim
 Version:	0.4.6
-Release:	2
+Release:	3
 License:	GPL/BSD
 Group:		System Environment/Libraries
 URL:		http://uim.freedesktop.org/
 Source0:	http://uim.freedesktop.org/release/%{name}-%{version}.tar.gz
 Source1:	xinput.d-uim
+Patch0:		uim-0.4.6-multilib.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	gtk2-devel gnome-panel-devel qt-devel ncurses-devel
 BuildRequires:	anthy-devel Canna-devel
@@ -120,13 +121,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .multilib
 
-%ifarch x86_64
 # patch creation:
 libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
 # touch uim/config.h.in, otherwise autoheader will run again
 touch uim/config.h.in
-%endif
 
 %build
 %configure --with-canna --with-anthy --with-gtk2 --with-gnome2 --with-qt --with-qt-immodule
@@ -286,6 +286,10 @@
 %{_datadir}/uim/skk*.scm
 
 %changelog
+* Mon May 16 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-3
+- uim-0.4.6-multilib.patch: applied to fix a build issue for
+  libquiminputcontextplugin.so. (John Thacker, #156880)
+
 * Fri May  6 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-2
 - added BuildRequires: ncurses-devel. (#156880)