Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild

Resolves: rhbz#2366917

sources

@@ -1 +1 @@
-SHA512 (uim-1.8.9.tar.bz2) = 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df
+SHA512 (uim-1.9.6.tar.bz2) = 6824b56116d4ad99802d349e4afc60eee143c8c25d8e1b32712989a020a647d9338e3f6d23a097c7725c67f0b62a3f8f3e217a40aac35c0076d3667723124210

uim-configure-c99.patch

@@ -1,20 +0,0 @@
-Avoid an undeclared exit function call in the snprintf configure check.
-This improves compatibility with strict(er) C99 compilers, which may
-not support implicit function declarations because they were removed
-from the C language in 1999.
-
-Submitted upstream: <https://github.com/uim/uim/pull/187>
-
-diff --git a/configure.ac b/configure.ac
-index 042d68927b76435c..84fcd38c9d3245db 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -595,7 +595,7 @@ if test "x$ac_cv_func_snprintf" = xyes; then
- 	AC_RUN_IFELSE(
- 		[AC_LANG_SOURCE([[
- #include <stdio.h>
--int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
-+int main(void){char b[5];snprintf(b,5,"123456789");return b[4]!='\0';}
- 		]])],
- 		[AC_MSG_RESULT(yes)],
- 		[

uim-enable-libgcroots.patch

@@ -1,11 +0,0 @@
---- uim-1.6.0.orig/configure.ac	2010-08-12 14:15:54.000000000 +0900
-+++ uim-1.6.0/configure.ac	2010-08-12 14:25:02.000000000 +0900
-@@ -1800,7 +1800,7 @@ AC_SUBST(abs_top_builddir)
- #
- # --with-master-pkg=uim instructs that pkgdatadir for Scheme libraries.
- # See also sigscheme/lib/Makefile.am
--ac_configure_args="$ac_configure_args --with-master-pkg=uim --enable-conf=uim --disable-libsscm --disable-shell"
-+ac_configure_args="$ac_configure_args --with-master-pkg=uim --enable-conf=uim --disable-libsscm --disable-shell --with-libgcroots=installed"
- AC_CONFIG_SUBDIRS([sigscheme])
- 
- AC_CONFIG_FILES([Makefile

uim-fix-bufferoverflow.patch

@@ -1,12 +0,0 @@
-diff -pruN uim-1.8.6.orig/uim/m17nlib.c uim-1.8.6/uim/m17nlib.c
---- uim-1.8.6.orig/uim/m17nlib.c	2013-06-30 13:26:09.000000000 +0900
-+++ uim-1.8.6/uim/m17nlib.c	2018-02-27 20:01:51.098951178 +0900
-@@ -232,7 +232,7 @@ static char *
- convert_mtext2str(MText *mtext)
- {
-   mconv_rebind_buffer(converter, (unsigned char *)buffer_for_converter,
--		      sizeof(buffer_for_converter));
-+		      sizeof(buffer_for_converter)-1);
-   mconv_encode(converter, mtext);
-   buffer_for_converter[converter->nbytes] = 0;
- 

uim-fix-emacs29.patch

@@ -1,35 +0,0 @@
-From 7b903ddf144344e49da12cc070f7c11f82ae61db Mon Sep 17 00:00:00 2001
-From: Sutou Kouhei <kou@clear-code.com>
-Date: Fri, 11 Aug 2023 10:44:26 +0900
-Subject: [PATCH] emacs: use set-face-underline
-
-set-face-underline-p is removed in Emacs 29.
----
- emacs/uim-var.el | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/emacs/uim-var.el b/emacs/uim-var.el
-index 189f91c9..ce40b6db 100644
---- a/emacs/uim-var.el
-+++ b/emacs/uim-var.el
-@@ -435,7 +435,7 @@ keeps the size of it when showing the candidates.")
- (make-face 'uim-preedit-face)
- 
- (copy-face 'uim-preedit-face 'uim-preedit-underline-face)
--(set-face-underline-p        'uim-preedit-underline-face t)
-+(set-face-underline          'uim-preedit-underline-face t)
- 
- ;; highlight
- (make-face 'uim-preedit-highlight-face)
-@@ -443,7 +443,7 @@ keeps the size of it when showing the candidates.")
- (set-face-background 'uim-preedit-highlight-face "Blue3")
- 
- (copy-face 'uim-preedit-highlight-face 'uim-preedit-highlight-underline-face)
--(set-face-underline-p 'uim-preedit-highlight-underline-face t)
-+(set-face-underline   'uim-preedit-highlight-underline-face t)
- 
- ;; separator
- (make-face 'uim-separator-face)
--- 
-2.43.0
-

uim-ftbfs.patch

@@ -0,0 +1,283 @@
+--- uim-1.8.9.orig/uim/uim-scm-sigscheme.c	2017-08-14 09:07:27.000000000 +0900
++++ uim-1.8.9/uim/uim-scm-sigscheme.c	2025-01-29 11:24:25.385409870 +0900
+@@ -722,7 +722,7 @@
+ 
+   return (void **)uim_scm_call_with_gc_ready_stack((uim_gc_gate_func_ptr)uim_scm_list2array_internal, &args);
+ }
+-  
++
+ static void *
+ uim_scm_list2array_internal(struct list2array_args *args)
+ {
+@@ -780,7 +780,7 @@
+ 
+   return (void **)uim_scm_call_with_gc_ready_stack((uim_gc_gate_func_ptr)uim_scm_vector2array_internal, &args);
+ }
+-  
++
+ static void *
+ uim_scm_vector2array_internal(struct vector2array_args *args)
+ {
+@@ -1225,7 +1225,7 @@
+   assert(name);
+   assert(func);
+ 
+-  scm_register_func(name, (scm_procedure_fixed_0)func, SCM_PROCEDURE_FIXED_0);
++  scm_register_func(name, (ScmFuncType)func, SCM_PROCEDURE_FIXED_0);
+ }
+ 
+ void
+@@ -1235,7 +1235,7 @@
+   assert(name);
+   assert(func);
+ 
+-  scm_register_func(name, (scm_procedure_fixed_1)func, SCM_PROCEDURE_FIXED_1);
++  scm_register_func(name, (ScmFuncType)func, SCM_PROCEDURE_FIXED_1);
+ }
+ 
+ void
+@@ -1245,7 +1245,7 @@
+   assert(name);
+   assert(func);
+ 
+-  scm_register_func(name, (scm_procedure_fixed_2)func, SCM_PROCEDURE_FIXED_2);
++  scm_register_func(name, (ScmFuncType)func, SCM_PROCEDURE_FIXED_2);
+ }
+ 
+ void
+@@ -1256,7 +1256,7 @@
+   assert(name);
+   assert(func);
+ 
+-  scm_register_func(name, (scm_procedure_fixed_3)func, SCM_PROCEDURE_FIXED_3);
++  scm_register_func(name, (ScmFuncType)func, SCM_PROCEDURE_FIXED_3);
+ }
+ 
+ void
+@@ -1267,7 +1267,7 @@
+   assert(name);
+   assert(func);
+ 
+-  scm_register_func(name, (scm_procedure_fixed_4)func, SCM_PROCEDURE_FIXED_4);
++  scm_register_func(name, (ScmFuncType)func, SCM_PROCEDURE_FIXED_4);
+ }
+ 
+ void
+@@ -1279,7 +1279,7 @@
+   assert(name);
+   assert(func);
+ 
+-  scm_register_func(name, (scm_procedure_fixed_5)func, SCM_PROCEDURE_FIXED_5);
++  scm_register_func(name, (ScmFuncType)func, SCM_PROCEDURE_FIXED_5);
+ }
+ 
+ void
+diff -pruN uim-1.8.9.orig/sigscheme/src/eval.c uim-1.8.9/sigscheme/src/eval.c
+--- uim-1.8.9.orig/sigscheme/src/eval.c	2015-05-30 22:08:55.000000000 +0900
++++ uim-1.8.9/sigscheme/src/eval.c	2025-01-29 11:40:17.497789730 +0900
+@@ -48,6 +48,24 @@
+ /*=======================================
+   File Local Type Definitions
+ =======================================*/
++typedef union ScmFuncClosure {
++  ScmObj (* efunc1) (ScmEvalState *);
++  ScmObj (* efunc2) (ScmObj, ScmEvalState *);
++  ScmObj (* efunc3) (ScmObj, ScmObj, ScmEvalState *);
++  ScmObj (* efunc4) (ScmObj, ScmObj, ScmObj, ScmEvalState *);
++  ScmObj (* efunc5) (ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *);
++  ScmObj (* efunc6) (ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *);
++  ScmObj (* efunc7) (ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState *);
++  ScmObj (* func0) (void);
++  ScmObj (* func1) (ScmObj);
++  ScmObj (* func2) (ScmObj, ScmObj);
++  ScmObj (* func3) (ScmObj, ScmObj, ScmObj);
++  ScmObj (* func4) (ScmObj, ScmObj, ScmObj, ScmObj);
++  ScmObj (* func5) (ScmObj, ScmObj, ScmObj, ScmObj, ScmObj);
++  ScmObj (* func6) (ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj);
++  ScmObj (* func7) (ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj);
++  ScmObj (* rfunc) (ScmObj, ScmObj, enum ScmReductionState *);
++} ScmFuncClosure;
+ 
+ /*=======================================
+   Variable Definitions
+@@ -56,7 +74,7 @@
+ /*=======================================
+   File Local Function Declarations
+ =======================================*/
+-static ScmObj reduce(ScmObj (*func)(), ScmObj args, ScmObj env,
++static ScmObj reduce(ScmFuncClosure *func, ScmObj args, ScmObj env,
+                      enum ScmValueType need_eval);
+ #if SCM_USE_CONTINUATION
+ static void call_continuation(ScmObj cont, ScmObj args,
+@@ -96,7 +114,7 @@ scm_call(ScmObj proc, ScmObj args)
+ 
+ /* ARGS should NOT have been evaluated yet. */
+ static ScmObj
+-reduce(ScmObj (*func)(), ScmObj args, ScmObj env, enum ScmValueType need_eval)
++reduce(ScmFuncClosure *func, ScmObj args, ScmObj env, enum ScmValueType need_eval)
+ {
+     ScmObj left, right;
+     enum ScmReductionState state;
+@@ -104,7 +122,7 @@ reduce(ScmObj (*func)(), ScmObj args, Sc
+ 
+     if (NO_MORE_ARG(args)) {
+         state = SCM_REDUCE_0;
+-        return (*func)(SCM_INVALID, SCM_INVALID, &state);
++        return (func->rfunc)(SCM_INVALID, SCM_INVALID, &state);
+     }
+ 
+     left = POP(args);
+@@ -113,7 +131,7 @@ reduce(ScmObj (*func)(), ScmObj args, Sc
+ 
+     if (NO_MORE_ARG(args)) {
+         state = SCM_REDUCE_1;
+-        return (*func)(left, left, &state);
++        return (func->rfunc)(left, left, &state);
+     }
+ 
+     /* Reduce upto the penult. */
+@@ -121,7 +139,7 @@ reduce(ScmObj (*func)(), ScmObj args, Sc
+     FOR_EACH_BUTLAST (right, args) {
+         if (need_eval)
+             right = EVAL(right, env);
+-        left = (*func)(left, right, &state);
++        left = (func->rfunc)(left, right, &state);
+         if (state == SCM_REDUCE_STOP)
+             return left;
+     }
+@@ -131,7 +149,7 @@ reduce(ScmObj (*func)(), ScmObj args, Sc
+     state = SCM_REDUCE_LAST;
+     if (need_eval)
+         right = EVAL(right, env);
+-    return (*func)(left, right, &state);
++    return (func->rfunc)(left, right, &state);
+ }
+ 
+ #if SCM_USE_CONTINUATION
+@@ -235,7 +253,7 @@ call(ScmObj proc, ScmObj args, ScmEvalSt
+      enum ScmValueType need_eval)
+ {
+     ScmObj env, vals;
+-    ScmObj (*func)();
++    ScmFuncClosure func;
+     enum ScmFuncTypeCode type;
+     scm_bool syntaxp;
+     int mand_count, i;
+@@ -324,10 +342,10 @@ call(ScmObj proc, ScmObj args, ScmEvalSt
+     /* We have a C function. */
+ 
+     type = SCM_FUNC_TYPECODE(proc);
+-    func = SCM_FUNC_CFUNC(proc);
++    func = (ScmFuncClosure) SCM_FUNC_CFUNC(proc);
+ 
+     if (type == SCM_REDUCTION_OPERATOR)
+-        return reduce(func, args, env, need_eval);
++        return reduce(&func, args, env, need_eval);
+ 
+     syntaxp = type & SCM_FUNCTYPE_SYNTAX;
+     if (syntaxp) {
+@@ -379,28 +397,28 @@ call(ScmObj proc, ScmObj args, ScmEvalSt
+     if (type & SCM_FUNCTYPE_TAILREC) {
+         switch (i) {
+         case 1:
+-            return (*func)(eval_state);
++            return (func.efunc1)(eval_state);
+         case 2:
+-            return (*func)(argbuf[0], eval_state);
++            return (func.efunc2)(argbuf[0], eval_state);
+         case 3:
+ #if SCM_FUNCTYPE_MAND_MAX >= 1
+-            return (*func)(argbuf[0], argbuf[1], eval_state);
++            return (func.efunc3)(argbuf[0], argbuf[1], eval_state);
+ #endif
+         case 4:
+ #if SCM_FUNCTYPE_MAND_MAX >= 2
+-            return (*func)(argbuf[0], argbuf[1], argbuf[2], eval_state);
++            return (func.efunc4)(argbuf[0], argbuf[1], argbuf[2], eval_state);
+ #endif
+         case 5:
+ #if SCM_FUNCTYPE_MAND_MAX >= 3
+-            return (*func)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], eval_state);
++            return (func.efunc5)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], eval_state);
+ #endif
+         case 6:
+ #if SCM_FUNCTYPE_MAND_MAX >= 4
+-            return (*func)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4], eval_state);
++            return (func.efunc6)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4], eval_state);
+ #endif
+         case 7:
+ #if SCM_FUNCTYPE_MAND_MAX >= 5
+-            return (*func)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4], argbuf[5], eval_state);
++            return (func.efunc7)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4], argbuf[5], eval_state);
+ #endif
+         default:
+             SCM_NOTREACHED;
+@@ -410,30 +428,30 @@ call(ScmObj proc, ScmObj args, ScmEvalSt
+ 
+     switch (i) {
+     case 0:
+-        return (*func)();
++        return (func.func0)();
+     case 1:
+-        return (*func)(argbuf[0]);
++        return (func.func1)(argbuf[0]);
+     case 2:
+-        return (*func)(argbuf[0], argbuf[1]);
++        return (func.func2)(argbuf[0], argbuf[1]);
+     case 3:
+ #if SCM_FUNCTYPE_MAND_MAX >= 1
+-        return (*func)(argbuf[0], argbuf[1], argbuf[2]);
++        return (func.func3)(argbuf[0], argbuf[1], argbuf[2]);
+ #endif
+     case 4:
+ #if SCM_FUNCTYPE_MAND_MAX >= 2
+-        return (*func)(argbuf[0], argbuf[1], argbuf[2], argbuf[3]);
++        return (func.func4)(argbuf[0], argbuf[1], argbuf[2], argbuf[3]);
+ #endif
+     case 5:
+ #if SCM_FUNCTYPE_MAND_MAX >= 3
+-        return (*func)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4]);
++        return (func.func5)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4]);
+ #endif
+     case 6:
+ #if SCM_FUNCTYPE_MAND_MAX >= 4
+-        return (*func)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4], argbuf[5]);
++        return (func.func6)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4], argbuf[5]);
+ #endif
+     case 7:
+ #if SCM_FUNCTYPE_MAND_MAX >= 5
+-        return (*func)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4], argbuf[5], argbuf[6]);
++        return (func.func7)(argbuf[0], argbuf[1], argbuf[2], argbuf[3], argbuf[4], argbuf[5], argbuf[6]);
+ #endif
+ 
+     default:
+diff -pruN uim-1.8.9.orig/sigscheme/src/module-srfi34.c uim-1.8.9/sigscheme/src/module-srfi34.c
+--- uim-1.8.9.orig/sigscheme/src/module-srfi34.c	2015-05-30 22:08:55.000000000 +0900
++++ uim-1.8.9/sigscheme/src/module-srfi34.c	2025-01-29 11:40:17.498789749 +0900
+@@ -190,19 +190,19 @@ scm_initialize_srfi34(void)
+     SCM_ASSERT_FUNCTYPE(scm_syntax_fixed_tailrec_0, &guard_body);
+ 
+     l_syn_raw_quote
+-        = MAKE_FUNC(SCM_SYNTAX_FIXED_1,         &raw_quote);
++        = MAKE_FUNC(SCM_SYNTAX_FIXED_1,         (ScmFuncType)&raw_quote);
+     l_syn_set_cur_handlers
+-        = MAKE_FUNC(SCM_SYNTAX_FIXED_1,         &set_cur_handlers);
++        = MAKE_FUNC(SCM_SYNTAX_FIXED_1,         (ScmFuncType)&set_cur_handlers);
+     l_proc_with_exception_handlers
+-        = MAKE_FUNC(SCM_PROCEDURE_FIXED_2,      &with_exception_handlers);
++        = MAKE_FUNC(SCM_PROCEDURE_FIXED_2,      (ScmFuncType)&with_exception_handlers);
+     l_syn_guard_internal
+-        = MAKE_FUNC(SCM_SYNTAX_FIXED_1,         &guard_internal);
++        = MAKE_FUNC(SCM_SYNTAX_FIXED_1,         (ScmFuncType)&guard_internal);
+     l_syn_guard_handler
+-        = MAKE_FUNC(SCM_SYNTAX_FIXED_TAILREC_1, &guard_handler);
++        = MAKE_FUNC(SCM_SYNTAX_FIXED_TAILREC_1, (ScmFuncType)&guard_handler);
+     l_syn_guard_handler_body
+-        = MAKE_FUNC(SCM_SYNTAX_FIXED_1,         &guard_handler_body);
++        = MAKE_FUNC(SCM_SYNTAX_FIXED_1,         (ScmFuncType)&guard_handler_body);
+     l_syn_guard_body
+-        = MAKE_FUNC(SCM_SYNTAX_FIXED_TAILREC_0, &guard_body);
++        = MAKE_FUNC(SCM_SYNTAX_FIXED_TAILREC_0, (ScmFuncType)&guard_body);
+ 
+     /*
+      * The 'error' procedure should not be invoked directly by

uim.spec

@@ -1,12 +1,12 @@
 %global inst_xinput %{_sbindir}/update-alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50
 %global uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf
-%global srcver	1.8.9
+%global srcver	1.9.6
 
 %bcond_with	canna
 
 Name:		uim
-Version:	1.8.9
-Release:	8%{?dist}
+Version:	1.9.6
+Release:	4%{?dist}
 # uim itself is licensed under BSD
 # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h}
 #   and qt/chardict/chardict-kseparator.{cpp,h} is licensed under LGPLv2+
@@ -16,11 +16,11 @@ URL:		https://github.com/uim/uim/
 
 BuildRequires:	libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel
 BuildRequires:	libgcroots-devel
-BuildRequires:	gtk2-devel gtk3-devel ncurses-devel
+BuildRequires:	gtk3-devel ncurses-devel
 %if %{with canna}
 BuildRequires:	Canna-devel
 %endif
-BuildRequires:	anthy-devel eb-devel gettext desktop-file-utils
+BuildRequires:	anthy-unicode-devel eb-devel gettext desktop-file-utils
 BuildRequires:	qt-devel cmake
 BuildRequires:	libedit-devel libcurl-devel sqlite-devel expat-devel
 BuildRequires:	m17n-lib-devel m17n-db-devel
@@ -34,8 +34,7 @@ Source0:	https://github.com/uim/uim/releases/download/%{version}/uim-%{version}.
 Source1:	xinput.d-uim
 Source2:	uim-init.el
 Patch1:		uim-emacs-utf8.patch
-Patch2:		uim-configure-c99.patch
-Patch3:		uim-fix-emacs29.patch
+#Patch4:		uim-ftbfs.patch
 
 
 Summary:	A multilingual input method library
@@ -60,14 +59,6 @@ Obsoletes:	%{name}-canna < %{version}-%{release}
 Summary:	Development files for the Uim library
 Requires:	uim = %{version}-%{release}
 
-%package	gtk2
-Summary:	GTK+2 support for Uim
-Requires:	uim = %{version}-%{release}
-# for update-gtk-immodules
-Requires(post):	gtk2 >= 2.9.1-2
-Requires(postun): gtk2
-Obsoletes:	%{name}-gnome < 1.8.5-4
-
 %package	gtk3
 Summary:	GTK+3 support for Uim
 Requires:	uim = %{version}-%{release}
@@ -75,6 +66,7 @@ Requires:	uim = %{version}-%{release}
 Requires(post):	gtk3
 Requires(postun): gtk3
 Obsoletes:	%{name}-gnome < 1.8.5-4
+Obsoletes:	%{name}-gtk2 < 1.9.5-1
 
 %package	qt
 Summary:	Qt4 support for Uim
@@ -92,7 +84,7 @@ Obsoletes:	uim-kde3 < 1.8.6-11
 
 %package	anthy
 Summary:	Anthy support for Uim
-Requires:	anthy >= 9100h-11
+Requires:	anthy-unicode
 Requires:	uim = %{version}-%{release}
 Requires(post):	gtk3 /usr/bin/uim-module-manager
 Requires(postun): gtk3 /usr/bin/uim-module-manager
@@ -130,7 +122,7 @@ This package provides the input method library, the XIM
 bridge and most of the input methods.
 
 For the Japanese input methods you need to install
-- uim-anthy for Anthy
+- uim-anthy for Anthy Unicode
 - uim-canna for Canna
 - uim-skk for SKK.
 
@@ -142,13 +134,6 @@ languages.
 This package contains the header files and the libraries which is
 needed for developing Uim applications.
 
-%description	gtk2
-Uim is a multilingual input method library. Uim aims to
-provide secure and useful input methods for all
-languages.
-
-This package provides the Gtk IM module and helper program.
-
 %description	gtk3
 Uim is a multilingual input method library. Uim aims to
 provide secure and useful input methods for all
@@ -199,26 +184,27 @@ autoconf
 %if %{with canna}
 	--with-canna \
 %endif
-	--with-anthy --with-anthy-utf8 \
+	--without-anthy \
+	--with-anthy-utf8 \
 	--with-m17nlib \
 	--with-eb --with-eb-conf=%{_libdir}/eb.conf \
 	--without-scim \
-        --with-gtk2 --with-gnome2 \
 	--with-gtk3 --enable-gnome3-applet \
 	--with-qt4 --with-qt4-immodule \
 	--enable-kde4-applet \
 	--with-curl \
 	--with-expat \
-	--enable-openssl --with-ssl-engine \
+	--disable-openssl \
 	--with-sqlite3 \
 	--with-lispdir=%{_datadir}/emacs/site-lisp \
-	--enable-pref
+	--enable-pref \
+	--enable-default-toolkit=gtk3
 #sed -i -e 's/^\(hardcode_direct=\)$/\1yes/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' -e 's/^hardcode_libdir_flag_spec.*$'/'hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' libtool
 sed -i -e 's/^\(hardcode_direct=\)$/\1no/' -e 's/^\(hardcode_minus_L=\)$/\1no/' -e 's/^\(libext=\)$/\1"a"/' libtool
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs make
+make
 
 %install
-LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
 %if 0%{?fedora} < 36
 # For XEmacs
 (cd emacs; make install DESTDIR=$RPM_BUILD_ROOT UIMEL_LISP_DIR=%{_datadir}/xemacs/site-packages/lisp/uim-el)
@@ -383,7 +369,6 @@ fi
 %{_libdir}/uim/plugin/libuim-fileio.so
 %{_libdir}/uim/plugin/libuim-lolevel.so
 %{_libdir}/uim/plugin/libuim-look.so
-# %%{_libdir}/uim/plugin/libuim-openssl.so
 %{_libdir}/uim/plugin/libuim-process.so
 %{_libdir}/uim/plugin/libuim-socket.so
 %{_libdir}/uim/plugin/libuim-sqlite3.so
@@ -409,22 +394,6 @@ fi
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*
 
-%files	gtk2
-%doc AUTHORS NEWS README
-%license COPYING
-# BSD
-%{_bindir}/uim-toolbar-gtk
-# BSD and LGPLv2+
-%{_bindir}/uim-toolbar-gtk-systray
-# BSD
-%{_bindir}/uim-pref-gtk
-%{_bindir}/uim-im-switcher-gtk
-%{_bindir}/uim-input-pad-ja
-%{_libdir}/gtk-2.0/2.*/immodules/*.so
-%{_libexecdir}/uim-candwin-gtk
-%{_libexecdir}/uim-candwin-horizontal-gtk
-%{_libexecdir}/uim-candwin-tbl-gtk
-
 %files	gtk3
 %doc AUTHORS NEWS README
 %license COPYING
@@ -459,7 +428,6 @@ fi
 %files	anthy
 %doc AUTHORS NEWS README
 %license COPYING
-%{_libdir}/uim/plugin/libuim-anthy.so
 %{_libdir}/uim/plugin/libuim-anthy-utf8.so
 %{_datadir}/uim/anthy*.scm
 # BSD or LGPLv2
@@ -497,6 +465,44 @@ fi
 %dir %{_datadir}/uim
 
 %changelog
+* Fri Jul 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild
+
+* Sat Jan 17 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
+
+* Fri Jul 25 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
+* Tue Jun  3 2025 Akira TAGOH <tagoh@redhat.com> - 1.9.6-1
+- New upstream release.
+  Resolves: rhbz#2366917
+
+* Tue May 13 2025 Akira TAGOH <tagoh@redhat.com> - 1.9.5-1
+- New upstream release.
+  Resolves: rhbz#2363935
+- Upstream dropped gtk2 support.
+
+* Fri Apr 18 2025 Akira TAGOH <tagoh@redhat.com> - 1.9.1-1
+- New upstream release.
+  Resolves: rhbz#2359276
+
+* Sat Mar 22 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.9.0-2
+- Replace anthy with anthy-unicode
+
+* Tue Feb 25 2025 Akira TAGOH <tagoh@redhat.com> - 1.9.0-1
+- New upstream release.
+  Resolves: rhbz#2347165
+- Disable OpenSSL support.
+  OpenSSL plugin isn't packaged. should be no harm.
+
+* Wed Jan 29 2025 Akira TAGOH <tagoh@redhat.com> - 1.8.9-10
+- Fix FTBFS
+  Resolves: rhbz#2341480
+
+* Sun Jan 19 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.9-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Sat Jul 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.9-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild