OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/uim?expand=0&rev=6

missing-header.patch

@@ -0,0 +1,24 @@
+diff -ru uim-1.2.1.orig/xim/locale.cpp uim-1.2.1/xim/locale.cpp
+--- uim-1.2.1.orig/xim/locale.cpp	2006-08-14 06:27:37.000000000 +0200
++++ uim-1.2.1/xim/locale.cpp	2008-01-11 22:36:04.000000000 +0100
+@@ -37,6 +37,8 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <locale.h>
+ #include <iconv.h>
+ #include <errno.h>
+uim-1.2.1/ximだけに発見: locale.cpp~
+diff -ru uim-1.2.1.orig/xim/ximserver.cpp uim-1.2.1/xim/ximserver.cpp
+--- uim-1.2.1.orig/xim/ximserver.cpp	2006-08-14 06:27:37.000000000 +0200
++++ uim-1.2.1/xim/ximserver.cpp	2008-01-11 22:28:06.000000000 +0100
+@@ -35,6 +35,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <ctype.h>
+ #include <locale.h>
+ #include <X11/Xlib.h>

uim.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 11 22:28:59 CET 2008 - mfabian@suse.de
+
+- include missing headers to make it build on STABLE.
+- use fdupes
+
 -------------------------------------------------------------------
 Mon May 07 12:20:34 CEST 2007 - mfabian@suse.de
 

uim.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package uim (Version 1.2.1)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -12,15 +12,18 @@
 
 Name:           uim
 BuildRequires:  anthy-devel canna-devel emacs-x11 gcc-c++ gnome-panel-devel gtk2-devel intltool ncurses-devel perl-XML-Parser pkg-config qt3-devel update-desktop-files xemacs
+%if %suse_version > 1020
+BuildRequires:  fdupes
+%endif
 # xorg-x11-libXdmcp-devel libgnomeprintui-devel
-License:        GNU General Public License (GPL)
+License:        GPL v2 or later
 Group:          System/I18n/Japanese
-Autoreqprov:    on
+AutoReqProv:    on
 PreReq:         %{_bindir}/touch
 Provides:       locale(xorg-x11:ja)
 Version:        1.2.1
-Release:        65
-URL:            http://uim.freedesktop.org/wiki/
+Release:        155
+Url:            http://uim.freedesktop.org/wiki/
 # svn co http://freedesktop.org:8080/svn/uim/trunk
 # Source0:      http://freedesktop.org/Software/UimDownload/uim-0.4.2.1.tar.bz2
 # freedesktop svn archive is broken. Currently there is an snapshot of
@@ -37,6 +40,7 @@ Patch4:         uim-configure.patch
 Patch5:         uim-slib.patch
 Patch6:         uim-aliasing.patch
 Patch7:         uim-el.patch
+Patch8:         missing-header.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Summary:        a multilingual input method library
 
@@ -119,6 +123,7 @@ Authors:
 %patch5
 #%patch6
 %patch7
+%patch8 -p1
 cp emacs/README README.emacs
 iconv -f euc-jp -t utf-8 < emacs/README.ja > README.ja.emacs
 
@@ -179,6 +184,9 @@ done
 find $RPM_BUILD_ROOT -name "*.scm" \
     | grep -E -v "installed-modules.scm|loader.scm" \
     | sort | uniq | perl -p -e "s|$RPM_BUILD_ROOT||" >> uim.lang
+%if %suse_version > 1020
+%fdupes $RPM_BUILD_ROOT/usr/share
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -190,7 +198,6 @@ rm -rf $RPM_BUILD_ROOT
 #     %{_datadir}/uim/loader.scm
 #     %{_datadir}/uim/modules
 uim-module-manager --register pyload anthy canna skk tcode tutcode hangul viqr ipa-x-sampa latin
- 
 
 %postun
 %run_ldconfig
@@ -273,6 +280,9 @@ touch var/adm/SuSEconfig/run-gtk
 %{_datadir}/uim/helperdata/bushu.t
 
 %changelog
+* Fri Jan 11 2008 - mfabian@suse.de
+- include missing headers to make it build on STABLE.
+- use fdupes
 * Mon May 07 2007 - mfabian@suse.de
 - Bugzilla #271696: fix bug in uim start script which made it
   impossible to set uim as the default input method.