rpms/uim/devel uim-0.4.6-dont-require-devel-pkgs.patch, NONE, 1.1 uim-0.4.6-fix-typo-in-configure.patch, NONE, 1.1 uim.spec, 1.11, 1.12

Thu Jun 16 15:46:54 UTC 2005

Author: tagoh

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

Modified Files:
	uim.spec 
Added Files:
	uim-0.4.6-dont-require-devel-pkgs.patch 
	uim-0.4.6-fix-typo-in-configure.patch 
Log Message:
* Mon Jun 13 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-4
- uim-0.4.6-fix-typo-in-configure.patch: applied to get uim-pref-gtk building.
- uim-0.4.6-dont-require-devel-pkgs.patch: applied to be able to dlopen
  the shared libraries without -devel packages.

uim-0.4.6-dont-require-devel-pkgs.patch:

--- NEW FILE uim-0.4.6-dont-require-devel-pkgs.patch ---
diff -ruN uim-0.4.6.orig/uim/anthy.c uim-0.4.6/uim/anthy.c
--- uim-0.4.6.orig/uim/anthy.c	2005-02-05 11:50:05.000000000 +0900
+++ uim-0.4.6/uim/anthy.c	2005-06-13 18:57:15.000000000 +0900
@@ -43,8 +43,8 @@
   #define LIBANTHY_SO    "libanthy.dylib"
   #define LIBANTHYDIC_SO "libanthydic.dylib"
 #else
-  #define LIBANTHY_SO    "libanthy.so"
-  #define LIBANTHYDIC_SO "libanthydic.so"
+  #define LIBANTHY_SO    "libanthy.so.0"
+  #define LIBANTHYDIC_SO "libanthydic.so.0"
 
 #endif /*__APPLE__*/
 
diff -ruN uim-0.4.6.orig/uim/canna.c uim-0.4.6/uim/canna.c
--- uim-0.4.6.orig/uim/canna.c	2005-02-05 11:50:05.000000000 +0900
+++ uim-0.4.6/uim/canna.c	2005-06-13 18:56:33.000000000 +0900
@@ -48,7 +48,7 @@
 /* #define UIM_CANNA_DEBUG */
 
 #define MAX_CONTEXT 256
-#define LIBCANNA_SO	"libcanna.so"
+#define LIBCANNA_SO	"libcanna.so.1"
 
 #define BUFSIZE 1024
 

uim-0.4.6-fix-typo-in-configure.patch:

--- NEW FILE uim-0.4.6-fix-typo-in-configure.patch ---
diff -ruN uim-0.4.6.orig/configure.ac uim-0.4.6/configure.ac
--- uim-0.4.6.orig/configure.ac	2005-06-13 18:08:30.000000000 +0900
+++ uim-0.4.6/configure.ac	2005-06-13 18:09:32.000000000 +0900
@@ -232,7 +232,7 @@
       ;;
       yes|*)
         PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no")
-        PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2.4="yes",use_gtk2.4="no")
+        PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2_4="yes",use_gtk2_4="no")
       ;;
     esac
   ],


Index: uim.spec
===================================================================
RCS file: /cvs/extras/rpms/uim/devel/uim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- uim.spec	16 May 2005 10:07:53 -0000	1.11
+++ uim.spec	16 Jun 2005 15:46:52 -0000	1.12
@@ -5,19 +5,22 @@
 Summary:	A multilingual input method library
 Name:		uim
 Version:	0.4.6
-Release:	3
+Release:	4
 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
 Requires(post): %{_sbindir}/alternatives /sbin/ldconfig
 Requires(postun): %{_sbindir}/alternatives /sbin/ldconfig
 
+Patch0:		uim-0.4.6-multilib.patch
+Patch1:		uim-0.4.6-fix-typo-in-configure.patch
+Patch2:		uim-0.4.6-dont-require-devel-pkgs.patch
+
 %package	devel
 Summary:	Development files for the Uim library
 Group:		Development/Libraries
@@ -117,11 +120,13 @@
 %description	skk
 This package provides support for SKK, a Japanese input method.
 
-%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_arch}-%{_host_vendor}-%{_host_os} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
+%define gtk_im_update ( [ -x "%{_bindir}/update-gtk-immodules" ] && %{_bindir}/update-gtk-immodules %{_target_platform} ) || ( [ -x "%{_bindir}/gtk-query-immodules-2.0" ] && %{_bindir}/gtk-query-immodules-2.0 > %{_sysconfdir}/gtk-2.0/gtk.immodules )
 
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .typo
+%patch2 -p1 -b .dlopen
 
 # patch creation:
 libtoolize --force && aclocal-1.9 -I m4 && autoheader && automake-1.9 --foreign && autoconf
@@ -142,7 +147,7 @@
 
 %find_lang %{name}
 
-find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk|uim-sh)" > scm.list
+find $RPM_BUILD_ROOT -name "*.scm" -type f | egrep -v "(anthy|canna|skk)" > scm.list
 cat scm.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang
 
 # compress large doc
@@ -214,6 +219,7 @@
 %lang(ja) %doc README.ja
 %{_bindir}/uim-fep*
 %{_bindir}/uim-helper-server
+%{_bindir}/uim-sh
 %{_bindir}/uim-xim
 %{_libdir}/lib*.so.*
 %dir %{_datadir}/uim
@@ -227,14 +233,12 @@
 %files	devel
 %defattr (-, root, root)
 %dir %{_datadir}/uim
-%{_bindir}/uim-sh
 %{_includedir}/uim/
 %{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a
 %{_libdir}/lib*.a
 %{_libdir}/lib*.la
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
-%{_datadir}/uim/uim-sh.scm
 
 %files	gtk2
 %defattr (-, root, root)
@@ -242,6 +246,7 @@
 %{_bindir}/uim-helper-candwin-gtk
 %{_bindir}/uim-helper-toolbar-gtk
 %{_bindir}/uim-helper-toolbar-gtk-systray
+%{_bindir}/uim-pref-gtk
 %{_bindir}/uim-toolbar-gtk
 %{_bindir}/uim-toolbar-gtk-systray
 %{_bindir}/uim-im-switcher-gtk
@@ -286,6 +291,11 @@
 %{_datadir}/uim/skk*.scm
 
 %changelog
+* Mon Jun 13 2005 Akira TAGOH <tagoh at redhat.com> - 0.4.6-4
+- uim-0.4.6-fix-typo-in-configure.patch: applied to get uim-pref-gtk building.
+- uim-0.4.6-dont-require-devel-pkgs.patch: applied to be able to dlopen
+  the shared libraries without -devel packages.
+
 * 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)


