From 13d56dda26e3614e3ebc753636b6fc3e8d21ca9d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 00:27:19 -0500 Subject: [PATCH 01/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 7b4b301..a442e5f 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 1%{?dist} +Release: 2%{?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+ @@ -551,6 +551,9 @@ fi %dir %{_datadir}/uim %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.8.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Jul 5 2013 Akira TAGOH - 1.8.6-1 - New upstream release. (#981433) From 2af5fcf79cb5ce82bb70a57d3b7e96e2d108adfe Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 3 Sep 2013 10:50:27 +0900 Subject: [PATCH 02/68] Drop older Obsoletes and Conflicts lines (#1002125) - Rebuilt against the latest eb. --- uim.spec | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/uim.spec b/uim.spec index a442e5f..e4f6d9f 100644 --- a/uim.spec +++ b/uim.spec @@ -64,7 +64,6 @@ Group: User Interface/Desktops %package qt3 Summary: Qt3 support for Uim Group: User Interface/Desktops -Obsoletes: uim-qt < 1.4.2-2 %{name}-qt-common < 1.6.0 Provides: %{name}-qt-common = %{version}-%{release} %package kde @@ -84,16 +83,12 @@ Summary: Emacs support for Uim Group: System Environment/Libraries Requires: emacs-common-uim = %{version}-%{release} Requires: emacs(bin) -Conflicts: uim-el < 1.5.0-1 -Obsoletes: uim-el < 1.5.0-1 Provides: uim-el = %{version}-%{release} %package -n emacs-common-uim Summary: Common package for Emacsen support for Uim Group: System Environment/Libraries Requires: uim = %{version}-%{release} -Conflicts: uim-el-common < 1.5.0-1 -Obsoletes: uim-el-common < 1.5.0-1 Provides: uim-el-common = %{version}-%{release} %package -n xemacs-uim @@ -551,6 +546,10 @@ fi %dir %{_datadir}/uim %changelog +* Tue Sep 3 2013 Akira TAGOH - 1.8.6-3 +- Drop older Obsoletes and Conflicts lines (#1002125) +- Rebuilt against the latest eb. + * Sun Aug 04 2013 Fedora Release Engineering - 1.8.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From ed6631bcf02944c352e6ef580b5189052605c9e0 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 3 Sep 2013 10:52:55 +0900 Subject: [PATCH 03/68] bump the release --- uim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index e4f6d9f..c193f27 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 2%{?dist} +Release: 3%{?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+ From d1d7edd3f9ce7a245fae3dd0b6a40dc6e5634f73 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 21:38:08 -0500 Subject: [PATCH 04/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index c193f27..e6c17d3 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 3%{?dist} +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+ @@ -546,6 +546,9 @@ fi %dir %{_datadir}/uim %changelog +* Sun Jun 08 2014 Fedora Release Engineering - 1.8.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Tue Sep 3 2013 Akira TAGOH - 1.8.6-3 - Drop older Obsoletes and Conflicts lines (#1002125) - Rebuilt against the latest eb. From 8734f339921c39de87c8fd1100e6720b613403fa Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 11 Jun 2014 20:38:14 +0900 Subject: [PATCH 05/68] Fix FTBFS (#1107024) --- uim-fix-m17n-icon-path.patch | 12 ++++++++++++ uim.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 uim-fix-m17n-icon-path.patch diff --git a/uim-fix-m17n-icon-path.patch b/uim-fix-m17n-icon-path.patch new file mode 100644 index 0000000..4b1371d --- /dev/null +++ b/uim-fix-m17n-icon-path.patch @@ -0,0 +1,12 @@ +diff -pruN uim-1.8.6.orig/pixmaps/uim-m17nlib-relink-icons.in uim-1.8.6/pixmaps/uim-m17nlib-relink-icons.in +--- uim-1.8.6.orig/pixmaps/uim-m17nlib-relink-icons.in 2013-06-30 13:26:09.000000000 +0900 ++++ uim-1.8.6/pixmaps/uim-m17nlib-relink-icons.in 2014-06-11 20:33:59.000000000 +0900 +@@ -31,7 +31,7 @@ + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +-for f in @m17n_db_dir@/icons/*.png; do ++for f in @m17n_db_dir@/*.png; do + if test -f "$f"; then + @LN_S@ -f "$f" ${DESTDIR}@uim_pixmapsdir@/m17n-`basename "$f"` + fi diff --git a/uim.spec b/uim.spec index e6c17d3..974705f 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 4%{?dist} +Release: 5%{?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+ @@ -26,6 +26,7 @@ Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch Patch2: uim-enable-libgcroots.patch +Patch3: uim-fix-m17n-icon-path.patch Summary: A multilingual input method library @@ -220,6 +221,7 @@ many languages using the input table map from m17n-db. %setup -q %patch1 -p1 -b .1-emacs %patch2 -p1 -b .2-libgcroots +%patch3 -p1 -b .3-m17n-icon-path autoconf @@ -546,6 +548,9 @@ fi %dir %{_datadir}/uim %changelog +* Wed Jun 11 2014 Akira TAGOH - 1.8.6-5 +* Fix FTBFS (#1107024) + * Sun Jun 08 2014 Fedora Release Engineering - 1.8.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 67a6d0d1b8c53e15f7b1aa7c3be4a83a15fd5219 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 11 Jun 2014 20:38:45 +0900 Subject: [PATCH 06/68] Fix FTBFS (#1107024) --- uim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 974705f..3c63a54 100644 --- a/uim.spec +++ b/uim.spec @@ -549,7 +549,7 @@ fi %changelog * Wed Jun 11 2014 Akira TAGOH - 1.8.6-5 -* Fix FTBFS (#1107024) +- Fix FTBFS (#1107024) * Sun Jun 08 2014 Fedora Release Engineering - 1.8.6-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 500fe5d5c648db2ce7fd5550d8fde16336b9fc10 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Mon, 18 Aug 2014 06:50:02 +0000 Subject: [PATCH 07/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 3c63a54..dfc7cc3 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 5%{?dist} +Release: 6%{?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+ @@ -548,6 +548,9 @@ fi %dir %{_datadir}/uim %changelog +* Mon Aug 18 2014 Fedora Release Engineering - 1.8.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jun 11 2014 Akira TAGOH - 1.8.6-5 - Fix FTBFS (#1107024) From 3692b1da2e2d82712914beeadd7484d6b70401f4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 19 Jun 2015 01:29:02 +0000 Subject: [PATCH 08/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index dfc7cc3..afa8462 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 6%{?dist} +Release: 7%{?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+ @@ -548,6 +548,9 @@ fi %dir %{_datadir}/uim %changelog +* Fri Jun 19 2015 Fedora Release Engineering - 1.8.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon Aug 18 2014 Fedora Release Engineering - 1.8.6-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild From df4db80f2c4ca2c112b7cf7dcb0a0b4289bdedd1 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 24 Jun 2015 12:29:35 +0900 Subject: [PATCH 09/68] Merge emacs sub-packages into main (#1234580) --- uim.spec | 66 +++++++++++++++++--------------------------------------- 1 file changed, 20 insertions(+), 46 deletions(-) diff --git a/uim.spec b/uim.spec index afa8462..575d87a 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 7%{?dist} +Release: 8%{?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+ @@ -34,6 +34,14 @@ Group: System Environment/Libraries Requires(post): %{_sbindir}/update-alternatives /sbin/ldconfig Requires(postun): %{_sbindir}/update-alternatives /sbin/ldconfig Requires: imsettings im-chooser +Requires: emacs-filesystem >= %{_emacs_version} +Requires: xemacs-filesystem >= %{_xemacs_version} +Provides: emacs-common-%{name} <= 1.8.6-7 +Obsoletes: emacs-common-%{name} <= 1.8.6-7 +Provides: emacs-%{name} <= 1.8.6-7, emacs-%{name}-el <= 1.8.6-7 +Obsoletes: emacs-%{name} <= 1.8.6-7, emacs-%{name}-el <= 1.8.6-7 +Provides: xemacs-%{name} <= 1.8.6-7, xemacs-%{name}-el <= 1.8.6-7 +Obsoletes: xemacs-%{name} <= 1.8.6-7, xemacs-%{name}-el <= 1.8.6-7 %package devel Summary: Development files for the Uim library @@ -79,25 +87,6 @@ Group: User Interface/Desktops Requires: uim = %{version}-%{release} Requires: uim-qt3 -%package -n emacs-uim -Summary: Emacs support for Uim -Group: System Environment/Libraries -Requires: emacs-common-uim = %{version}-%{release} -Requires: emacs(bin) -Provides: uim-el = %{version}-%{release} - -%package -n emacs-common-uim -Summary: Common package for Emacsen support for Uim -Group: System Environment/Libraries -Requires: uim = %{version}-%{release} -Provides: uim-el-common = %{version}-%{release} - -%package -n xemacs-uim -Summary: XEmacs support for Uim -Group: System Environment/Libraries -Requires: emacs-common-uim = %{version}-%{release} -Requires: xemacs(bin) xemacs-packages-extra - %package anthy Summary: Anthy support for Uim Group: System Environment/Libraries @@ -194,15 +183,6 @@ languages. This package provides the KDE3 applet. -%description -n emacs-uim -This package provides Emacs support. - -%description -n emacs-common-uim -This package provides an utility to use Emacsen support for Uim. - -%description -n xemacs-uim -This package provides XEmacs support. - %description anthy This package provides support for Anthy, a Japanese input method. @@ -430,6 +410,14 @@ fi %{_libdir}/uim/plugin/libuim-sqlite3.so %{_libexecdir}/uim-helper-server %{_mandir}/man1/uim-xim.1* +%doc emacs/COPYING emacs/README +%lang(ja) %doc emacs/README.ja +%{_bindir}/uim-el-agent +%{_bindir}/uim-el-helper-agent +%{_datadir}/emacs/site-lisp/uim-el +%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el +%{_datadir}/xemacs/site-packages/lisp/uim-el +%{_datadir}/xemacs/site-packages/lisp/site-start.d/uim-init.el %files devel %doc AUTHORS COPYING ChangeLog* NEWS README @@ -496,23 +484,6 @@ fi %{_libdir}/kde3/uim_panelapplet.so %{_datadir}/apps/kicker/applets/uimapplet.desktop -%files -n emacs-uim -%doc emacs/COPYING emacs/README -%lang(ja) %doc emacs/README.ja -%{_datadir}/emacs/site-lisp/uim-el -%{_datadir}/emacs/site-lisp/site-start.d/uim-init.el - -%files -n xemacs-uim -%doc emacs/COPYING emacs/README -%lang(ja) %doc emacs/README.ja -%{_datadir}/xemacs/site-packages/lisp/uim-el -%{_datadir}/xemacs/site-packages/lisp/site-start.d/uim-init.el - -%files -n emacs-common-uim -%doc emacs/COPYING emacs/README -%{_bindir}/uim-el-agent -%{_bindir}/uim-el-helper-agent - %files anthy %doc AUTHORS COPYING ChangeLog* NEWS README %{_libdir}/uim/plugin/libuim-anthy.so @@ -548,6 +519,9 @@ fi %dir %{_datadir}/uim %changelog +* Wed Jun 24 2015 Akira TAGOH - 1.8.6-8 +- Merge emacs sub-packages into main (#1234580) + * Fri Jun 19 2015 Fedora Release Engineering - 1.8.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 976d84d6d2984367185ea3112e24c4497574a969 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 24 Jun 2015 12:53:24 +0900 Subject: [PATCH 10/68] Merge emacs sub-packages into main (#1234580) --- uim-fix-m17n-icon-path.patch | 12 ------------ uim.spec | 3 +-- 2 files changed, 1 insertion(+), 14 deletions(-) delete mode 100644 uim-fix-m17n-icon-path.patch diff --git a/uim-fix-m17n-icon-path.patch b/uim-fix-m17n-icon-path.patch deleted file mode 100644 index 4b1371d..0000000 --- a/uim-fix-m17n-icon-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -pruN uim-1.8.6.orig/pixmaps/uim-m17nlib-relink-icons.in uim-1.8.6/pixmaps/uim-m17nlib-relink-icons.in ---- uim-1.8.6.orig/pixmaps/uim-m17nlib-relink-icons.in 2013-06-30 13:26:09.000000000 +0900 -+++ uim-1.8.6/pixmaps/uim-m17nlib-relink-icons.in 2014-06-11 20:33:59.000000000 +0900 -@@ -31,7 +31,7 @@ - # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --for f in @m17n_db_dir@/icons/*.png; do -+for f in @m17n_db_dir@/*.png; do - if test -f "$f"; then - @LN_S@ -f "$f" ${DESTDIR}@uim_pixmapsdir@/m17n-`basename "$f"` - fi diff --git a/uim.spec b/uim.spec index 575d87a..f764b2c 100644 --- a/uim.spec +++ b/uim.spec @@ -26,7 +26,6 @@ Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch Patch2: uim-enable-libgcroots.patch -Patch3: uim-fix-m17n-icon-path.patch Summary: A multilingual input method library @@ -201,7 +200,6 @@ many languages using the input table map from m17n-db. %setup -q %patch1 -p1 -b .1-emacs %patch2 -p1 -b .2-libgcroots -%patch3 -p1 -b .3-m17n-icon-path autoconf @@ -521,6 +519,7 @@ fi %changelog * Wed Jun 24 2015 Akira TAGOH - 1.8.6-8 - Merge emacs sub-packages into main (#1234580) +- Revert the icon path for m17n * Fri Jun 19 2015 Fedora Release Engineering - 1.8.6-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From c9065fe79a5856e0959874b0b638cb8ef157ce60 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 24 Jun 2015 12:54:14 +0900 Subject: [PATCH 11/68] Fix bogus date --- uim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index f764b2c..4c9eb59 100644 --- a/uim.spec +++ b/uim.spec @@ -600,7 +600,7 @@ fi * Tue May 24 2011 Akira TAGOH - 1.7.0-1 - New upstream release. -* Thu May 11 2011 Akira TAGOH - 1.7.0-0.1.20110511svn +* Wed May 11 2011 Akira TAGOH - 1.7.0-0.1.20110511svn - Update to the snapshot for gtk3 support. * Tue Mar 22 2011 Akira TAGOH - 1.6.1-3 From e06a3dabede35c7eff7bffddd608874f4c4cedc2 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 4 Jan 2016 16:35:25 +0900 Subject: [PATCH 12/68] Use %global instead of %define. --- uim.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uim.spec b/uim.spec index 4c9eb59..31d6f22 100644 --- a/uim.spec +++ b/uim.spec @@ -1,5 +1,5 @@ -%define inst_xinput %{_sbindir}/update-alternatives --install %{_sysconfdir}/X11/xinit/xinputrc xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf 50 -%define uninst_xinput %{_sbindir}/update-alternatives --remove xinputrc %{_sysconfdir}/X11/xinit/xinput.d/uim.conf +%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 Name: uim Version: 1.8.6 @@ -517,6 +517,9 @@ fi %dir %{_datadir}/uim %changelog +* Mon Jan 4 2016 Akira TAGOH +- Use %%global instead of %%define. + * Wed Jun 24 2015 Akira TAGOH - 1.8.6-8 - Merge emacs sub-packages into main (#1234580) - Revert the icon path for m17n From 92fc98fe669ce62da6fd4284ffcadde72861cd75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 5 Feb 2016 02:17:16 +0000 Subject: [PATCH 13/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 31d6f22..3473f53 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 8%{?dist} +Release: 9%{?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+ @@ -517,6 +517,9 @@ fi %dir %{_datadir}/uim %changelog +* Fri Feb 05 2016 Fedora Release Engineering - 1.8.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 4 2016 Akira TAGOH - Use %%global instead of %%define. From e0fe3882bca2947280b9d3f56fc10b75739ca9b3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 16:39:42 +0000 Subject: [PATCH 14/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 3473f53..52e4ab4 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 9%{?dist} +Release: 10%{?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+ @@ -517,6 +517,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 1.8.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Feb 05 2016 Fedora Release Engineering - 1.8.6-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0230d011f1a30fe8323c12404725fef3c2214b5e Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 13 Feb 2017 20:41:51 +0900 Subject: [PATCH 15/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- uim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 52e4ab4..385a684 100644 --- a/uim.spec +++ b/uim.spec @@ -17,7 +17,7 @@ BuildRequires: gtk2-devel gtk3-devel ncurses-devel BuildRequires: anthy-devel Canna-devel eb-devel gettext desktop-file-utils BuildRequires: qt3-devel kdelibs3-devel BuildRequires: qt-devel cmake kdelibs-devel -BuildRequires: libedit-devel openssl-devel libcurl-devel sqlite-devel expat-devel +BuildRequires: libedit-devel compat-openssl10-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras BuildRequires: emacs libtool automake autoconf intltool From eaa327cb609141e4a2375d47437e4baf3d1e04e9 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 13 Feb 2017 20:43:03 +0900 Subject: [PATCH 16/68] Fix FTBFS. --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 385a684..996a6df 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 10%{?dist} +Release: 11%{?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+ @@ -517,6 +517,9 @@ fi %dir %{_datadir}/uim %changelog +* Mon Feb 13 2017 Akira TAGOH - 1.8.6-11 +- Fix FTBFS. + * Sat Feb 11 2017 Fedora Release Engineering - 1.8.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 8b62c022fa54828cd7f7b0f809af611d0e886c43 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 13 Feb 2017 20:48:07 +0900 Subject: [PATCH 17/68] Fix FTBFS. --- uim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 996a6df..a4165d5 100644 --- a/uim.spec +++ b/uim.spec @@ -17,7 +17,7 @@ BuildRequires: gtk2-devel gtk3-devel ncurses-devel BuildRequires: anthy-devel Canna-devel eb-devel gettext desktop-file-utils BuildRequires: qt3-devel kdelibs3-devel BuildRequires: qt-devel cmake kdelibs-devel -BuildRequires: libedit-devel compat-openssl10-devel libcurl-devel sqlite-devel expat-devel +BuildRequires: libedit-devel openssl-devel compat-openssl10-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras BuildRequires: emacs libtool automake autoconf intltool From a2d39c51235866207522987ed9e646fe7f5be69e Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 28 Feb 2017 21:19:18 +0900 Subject: [PATCH 18/68] Fix FTBFS. --- uim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index a4165d5..2bf1190 100644 --- a/uim.spec +++ b/uim.spec @@ -17,7 +17,7 @@ BuildRequires: gtk2-devel gtk3-devel ncurses-devel BuildRequires: anthy-devel Canna-devel eb-devel gettext desktop-file-utils BuildRequires: qt3-devel kdelibs3-devel BuildRequires: qt-devel cmake kdelibs-devel -BuildRequires: libedit-devel openssl-devel compat-openssl10-devel libcurl-devel sqlite-devel expat-devel +BuildRequires: libedit-devel openssl-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras BuildRequires: emacs libtool automake autoconf intltool From 23af62e6ddaa6435e4db14f9c7c64a12ab601884 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 28 Feb 2017 21:35:53 +0900 Subject: [PATCH 19/68] Fix FTBFS. (#1424232) Drop uim-qt3/uim-kde3 sub-packages due to the build issue. --- uim.spec | 51 ++++++--------------------------------------------- 1 file changed, 6 insertions(+), 45 deletions(-) diff --git a/uim.spec b/uim.spec index 2bf1190..2de308e 100644 --- a/uim.spec +++ b/uim.spec @@ -15,7 +15,6 @@ BuildRequires: libXft-devel libX11-devel libXext-devel libXrender-devel libXau-d BuildRequires: libgcroots-devel BuildRequires: gtk2-devel gtk3-devel ncurses-devel BuildRequires: anthy-devel Canna-devel eb-devel gettext desktop-file-utils -BuildRequires: qt3-devel kdelibs3-devel BuildRequires: qt-devel cmake kdelibs-devel BuildRequires: libedit-devel openssl-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel @@ -68,23 +67,16 @@ Obsoletes: %{name}-gnome < 1.8.5-4 %package qt Summary: Qt4 support for Uim Group: User Interface/Desktops - -%package qt3 -Summary: Qt3 support for Uim -Group: User Interface/Desktops -Provides: %{name}-qt-common = %{version}-%{release} +Provides: uim-qt3 = %{version}-%{release} +Obsoletes: uim-qt3 < 1.8.6-11 %package kde Summary: KDE Applet for Uim Group: User Interface/Desktops Requires: uim = %{version}-%{release} Requires: uim-qt - -%package kde3 -Summary: KDE3 Applet for Uim -Group: User Interface/Desktops -Requires: uim = %{version}-%{release} -Requires: uim-qt3 +Provides: uim-kde3 = %{version}-%{release} +Obsoletes: uim-kde3 < 1.8.6-11 %package anthy Summary: Anthy support for Uim @@ -161,13 +153,6 @@ languages. This package provides the Qt4 IM module and helper programs. -%description qt3 -Uim is a multilingual input method library. Uim aims to -provide secure and useful input methods for all -languages. - -This package provides the Qt3 IM module and helper programs. - %description kde Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all @@ -175,13 +160,6 @@ languages. This package provides the KDE applet. -%description kde3 -Uim is a multilingual input method library. Uim aims to -provide secure and useful input methods for all -languages. - -This package provides the KDE3 applet. - %description anthy This package provides support for Anthy, a Japanese input method. @@ -459,29 +437,11 @@ fi %{_libexecdir}/uim-candwin-qt4 %{_libdir}/qt4/plugins/inputmethods/libuiminputcontextplugin.so -%files qt3 -%doc AUTHORS COPYING ChangeLog* NEWS README -# BSD and LGPLv2+ -%{_bindir}/uim-chardict-qt -# BSD -%{_bindir}/uim-im-switcher-qt -# BSD and LGPLv2+ -%{_bindir}/uim-pref-qt -# BSD -%{_bindir}/uim-toolbar-qt -%{_libexecdir}/uim-candwin-qt -%{_libdir}/qt-3.*/plugins/inputmethods - %files kde %doc AUTHORS COPYING ChangeLog* NEWS README %{_libdir}/kde4/plasma_applet_uim.so %{_datadir}/kde4/services/plasma-applet-uim.desktop -%files kde3 -%doc AUTHORS COPYING ChangeLog* NEWS README -%{_libdir}/kde3/uim_panelapplet.so -%{_datadir}/apps/kicker/applets/uimapplet.desktop - %files anthy %doc AUTHORS COPYING ChangeLog* NEWS README %{_libdir}/uim/plugin/libuim-anthy.so @@ -518,7 +478,8 @@ fi %changelog * Mon Feb 13 2017 Akira TAGOH - 1.8.6-11 -- Fix FTBFS. +- Fix FTBFS. (#1424232) +- Drop uim-qt3/uim-kde3 sub-packages due to the build issue. * Sat Feb 11 2017 Fedora Release Engineering - 1.8.6-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From b9d7fbb2f2a0830e8cba65e13d31c512208ee732 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 28 Feb 2017 21:48:19 +0900 Subject: [PATCH 20/68] Fix FTBFS. (#1424232) Drop uim-qt3/uim-kde3 sub-packages due to the build issue. --- uim.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/uim.spec b/uim.spec index 2de308e..6513853 100644 --- a/uim.spec +++ b/uim.spec @@ -182,8 +182,6 @@ autoconf %build -# assumes that this is built against qt-3.3. -export QTDIR=%{_libdir}/qt-3.3 %configure --with-x --with-xft \ --with-canna \ --with-anthy --with-anthy-utf8 \ @@ -192,7 +190,6 @@ export QTDIR=%{_libdir}/qt-3.3 --without-scim \ --with-gtk2 --with-gnome2 \ --with-gtk3 --enable-gnome3-applet \ - --with-qt --with-qt-immodule \ --with-qt4 --with-qt4-immodule \ --enable-kde-applet --enable-kde4-applet \ --with-curl \ @@ -218,7 +215,6 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.la rm -rf $RPM_BUILD_ROOT%{_libdir}/uim/plugin/*la rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/immodules/im-uim.*a rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/3.*/immodules/im-uim.*a -rm -rf $RPM_BUILD_ROOT%{_libdir}/qt-3.*/plugins/inputmethods/lib*.*a #rm -rf $RPM_BUILD_ROOT%{_libdir}/libgcroots.* #rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig/gcroots.pc #rm -rf $RPM_BUILD_ROOT%{_includedir}/gcroots.h From 70a5e7c1f1cb5327a842445e388f6ba49bb3fcac Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 28 Feb 2017 22:30:13 +0900 Subject: [PATCH 21/68] Fix FTBFS. (#1424232) Drop uim-qt3/uim-kde3 sub-packages due to the build issue. --- uim.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 6513853..61fc850 100644 --- a/uim.spec +++ b/uim.spec @@ -16,7 +16,7 @@ BuildRequires: libgcroots-devel BuildRequires: gtk2-devel gtk3-devel ncurses-devel BuildRequires: anthy-devel Canna-devel eb-devel gettext desktop-file-utils BuildRequires: qt-devel cmake kdelibs-devel -BuildRequires: libedit-devel openssl-devel libcurl-devel sqlite-devel expat-devel +BuildRequires: libedit-devel compat-openssl10-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras BuildRequires: emacs libtool automake autoconf intltool From 8f15253594e55d9dcb9f4d70ae4e0b8a648fcd50 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 20:55:43 +0000 Subject: [PATCH 22/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 61fc850..2ee6420 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 11%{?dist} +Release: 12%{?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+ @@ -473,6 +473,9 @@ fi %dir %{_datadir}/uim %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 1.8.6-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Feb 13 2017 Akira TAGOH - 1.8.6-11 - Fix FTBFS. (#1424232) - Drop uim-qt3/uim-kde3 sub-packages due to the build issue. From f8e33b36f327f6a23546ba05553fa9c08680c1e0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 09:44:48 +0000 Subject: [PATCH 23/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 2ee6420..0fbde32 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 12%{?dist} +Release: 13%{?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+ @@ -473,6 +473,9 @@ fi %dir %{_datadir}/uim %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.8.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 1.8.6-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 161856a0ab83dc2b678722a373590aebd85f7f54 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 6 Jan 2018 10:37:02 +0100 Subject: [PATCH 24/68] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- uim.spec | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/uim.spec b/uim.spec index 0fbde32..c363c25 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 13%{?dist} +Release: 14%{?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+ @@ -268,22 +268,6 @@ if [ "$1" = "0" ]; then /usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --unregister tcode trycode tutcode byeoru latin pyload hangul viqr ipa-x-sampa > /dev/null 2>&1 || : fi -%post gtk2 -umask 022 -%{_bindir}/update-gtk-immodules %{_host} || : - -%postun gtk2 -umask 022 -%{_bindir}/update-gtk-immodules %{_host} || : - -%post gtk3 -umask 022 -%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || : - -%postun gtk3 -umask 022 -%{_bindir}/gtk-query-immodules-3.0-%{__isa_bits} --update-cache || : - %post anthy # since F-13 ## get rid of anthy for inconvenience, because anthy-utf8 is default now. @@ -473,6 +457,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jan 06 2018 Igor Gnatenko - 1.8.6-14 +- Remove obsolete scriptlets + * Thu Aug 03 2017 Fedora Release Engineering - 1.8.6-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From a82bb476d0bb99e81ab83b87fcbcfcb51f8f72ac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 19:56:14 +0000 Subject: [PATCH 25/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index c363c25..cba17fc 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 14%{?dist} +Release: 15%{?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+ @@ -457,6 +457,9 @@ fi %dir %{_datadir}/uim %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 1.8.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Sat Jan 06 2018 Igor Gnatenko - 1.8.6-14 - Remove obsolete scriptlets From 1afef3dfd03ac62259af62dd7a67c46a4e43bc44 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 14 Feb 2018 15:07:20 +0900 Subject: [PATCH 26/68] Fix the build fail. --- uim.spec | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/uim.spec b/uim.spec index cba17fc..97755cb 100644 --- a/uim.spec +++ b/uim.spec @@ -3,13 +3,13 @@ Name: uim Version: 1.8.6 -Release: 15%{?dist} +Release: 16%{?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+ # pixmaps/*.{svg,png} is licensed under BSD or LGPLv2 License: BSD and LGPLv2+ and (BSD or LGPLv2) -URL: http://code.google.com/p/uim/ +URL: https://github.com/uim/uim/ BuildRequires: libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel BuildRequires: libgcroots-devel @@ -19,7 +19,7 @@ BuildRequires: qt-devel cmake kdelibs-devel BuildRequires: libedit-devel compat-openssl10-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras -BuildRequires: emacs libtool automake autoconf intltool +BuildRequires: emacs libtool automake autoconf intltool xemacs Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: xinput.d-uim Source2: uim-init.el @@ -305,7 +305,8 @@ fi %files -f %{name}.lang -%doc AUTHORS COPYING ChangeLog* NEWS README fep/README.fep fep/README.fep.key xim/README.xim +%doc AUTHORS ChangeLog* NEWS README fep/README.fep fep/README.fep.key xim/README.xim +%license COPYING %lang(ja) %doc fep/README.fep.ja %dir %{_libdir}/uim %dir %{_libdir}/uim/plugin @@ -366,8 +367,9 @@ fi %{_libdir}/uim/plugin/libuim-sqlite3.so %{_libexecdir}/uim-helper-server %{_mandir}/man1/uim-xim.1* -%doc emacs/COPYING emacs/README +%doc emacs/README %lang(ja) %doc emacs/README.ja +%license emacs/COPYING %{_bindir}/uim-el-agent %{_bindir}/uim-el-helper-agent %{_datadir}/emacs/site-lisp/uim-el @@ -376,13 +378,15 @@ fi %{_datadir}/xemacs/site-packages/lisp/site-start.d/uim-init.el %files devel -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS ChangeLog* NEWS README +%license COPYING %{_includedir}/uim/ %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %files gtk2 -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS ChangeLog* NEWS README +%license COPYING # BSD %{_bindir}/uim-toolbar-gtk # BSD and LGPLv2+ @@ -397,7 +401,8 @@ fi %{_libexecdir}/uim-candwin-tbl-gtk %files gtk3 -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS ChangeLog* NEWS README +%license COPYING %{_bindir}/uim-im-switcher-gtk3 %{_bindir}/uim-input-pad-ja-gtk3 %{_bindir}/uim-pref-gtk3 @@ -409,7 +414,8 @@ fi %{_libexecdir}/uim-candwin-tbl-gtk3 %files qt -%doc AUTHORS COPYING ChangeLog* NEWS +%doc AUTHORS ChangeLog* NEWS +%license COPYING %{_bindir}/uim-chardict-qt4 %{_bindir}/uim-im-switcher-qt4 %{_bindir}/uim-pref-qt4 @@ -418,12 +424,14 @@ fi %{_libdir}/qt4/plugins/inputmethods/libuiminputcontextplugin.so %files kde -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS ChangeLog* NEWS README +%license COPYING %{_libdir}/kde4/plasma_applet_uim.so %{_datadir}/kde4/services/plasma-applet-uim.desktop %files anthy -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS ChangeLog* NEWS README +%license COPYING %{_libdir}/uim/plugin/libuim-anthy.so %{_libdir}/uim/plugin/libuim-anthy-utf8.so %{_datadir}/uim/anthy*.scm @@ -432,14 +440,16 @@ fi %dir %{_datadir}/uim %files canna -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS ChangeLog* NEWS README +%license COPYING %{_datadir}/uim/canna*.scm # BSD or LGPLv2 %{_datadir}/uim/pixmaps/canna.png %dir %{_datadir}/uim %files skk -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS ChangeLog* NEWS README +%license COPYING %{_libdir}/uim/plugin/libuim-skk.so %{_datadir}/uim/skk*.scm %{_datadir}/uim/pixmaps/skk*.png @@ -447,7 +457,8 @@ fi %dir %{_datadir}/uim %files m17n -%doc AUTHORS COPYING ChangeLog* NEWS README +%doc AUTHORS ChangeLog* NEWS README +%license COPYING %{_bindir}/uim-m17nlib-relink-icons %{_libdir}/uim/plugin/libuim-m17nlib.so %{_datadir}/uim/m17nlib.scm @@ -457,6 +468,9 @@ fi %dir %{_datadir}/uim %changelog +* Wed Feb 14 2018 Akira TAGOH - 1.8.6-16 +- Fix the build fail. + * Fri Feb 09 2018 Fedora Release Engineering - 1.8.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From bf9a6dc297274a31a765b120d3142f3a3ea7e0a3 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 14 Feb 2018 17:01:52 +0900 Subject: [PATCH 27/68] Fix the build fail. Disable uim-kde sub-package. --- uim.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/uim.spec b/uim.spec index 97755cb..b189eed 100644 --- a/uim.spec +++ b/uim.spec @@ -15,8 +15,8 @@ BuildRequires: libXft-devel libX11-devel libXext-devel libXrender-devel libXau-d BuildRequires: libgcroots-devel BuildRequires: gtk2-devel gtk3-devel ncurses-devel BuildRequires: anthy-devel Canna-devel eb-devel gettext desktop-file-utils -BuildRequires: qt-devel cmake kdelibs-devel -BuildRequires: libedit-devel compat-openssl10-devel libcurl-devel sqlite-devel expat-devel +BuildRequires: qt-devel cmake +BuildRequires: libedit-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras BuildRequires: emacs libtool automake autoconf intltool xemacs @@ -70,6 +70,7 @@ Group: User Interface/Desktops Provides: uim-qt3 = %{version}-%{release} Obsoletes: uim-qt3 < 1.8.6-11 +%if 0 %package kde Summary: KDE Applet for Uim Group: User Interface/Desktops @@ -77,6 +78,7 @@ Requires: uim = %{version}-%{release} Requires: uim-qt Provides: uim-kde3 = %{version}-%{release} Obsoletes: uim-kde3 < 1.8.6-11 +%endif %package anthy Summary: Anthy support for Uim @@ -153,12 +155,14 @@ languages. This package provides the Qt4 IM module and helper programs. +%if 0 %description kde Uim is a multilingual input method library. Uim aims to provide secure and useful input methods for all languages. This package provides the KDE applet. +%endif %description anthy This package provides support for Anthy, a Japanese input method. @@ -191,7 +195,7 @@ autoconf --with-gtk2 --with-gnome2 \ --with-gtk3 --enable-gnome3-applet \ --with-qt4 --with-qt4-immodule \ - --enable-kde-applet --enable-kde4-applet \ + --enable-kde4-applet \ --with-curl \ --with-expat \ --enable-openssl --with-ssl-engine \ @@ -221,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/3.*/immodules/im-uim.*a rm -rf $RPM_BUILD_ROOT%{_includedir}/sigscheme rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm -rm -rf $RPM_BUILD_ROOT%{_libdir}/kde3/*.la +#rm -rf $RPM_BUILD_ROOT%{_libdir}/kde3/*.la #rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/kicker/applets/uimapplet.desktop install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d @@ -423,11 +427,13 @@ fi %{_libexecdir}/uim-candwin-qt4 %{_libdir}/qt4/plugins/inputmethods/libuiminputcontextplugin.so +%if 0 %files kde %doc AUTHORS ChangeLog* NEWS README %license COPYING %{_libdir}/kde4/plasma_applet_uim.so %{_datadir}/kde4/services/plasma-applet-uim.desktop +%endif %files anthy %doc AUTHORS ChangeLog* NEWS README @@ -470,6 +476,7 @@ fi %changelog * Wed Feb 14 2018 Akira TAGOH - 1.8.6-16 - Fix the build fail. +- Disable uim-kde sub-package. * Fri Feb 09 2018 Fedora Release Engineering - 1.8.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 260809aa3e28bb40bbc7f0c31c1466e381d0fce3 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 27 Feb 2018 20:53:26 +0900 Subject: [PATCH 28/68] Add BR: gcc gcc-c++ Fix the buffer overflow. (#1549478) --- uim-fix-bufferoverflow.patch | 12 ++++++++++++ uim.spec | 14 +++++++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 uim-fix-bufferoverflow.patch diff --git a/uim-fix-bufferoverflow.patch b/uim-fix-bufferoverflow.patch new file mode 100644 index 0000000..eff6d6f --- /dev/null +++ b/uim-fix-bufferoverflow.patch @@ -0,0 +1,12 @@ +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; + diff --git a/uim.spec b/uim.spec index b189eed..f1ef326 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 16%{?dist} +Release: 17%{?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+ @@ -20,11 +20,13 @@ BuildRequires: libedit-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras BuildRequires: emacs libtool automake autoconf intltool xemacs +BuildRequires: gcc gcc-c++ Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch Patch2: uim-enable-libgcroots.patch +Patch3: uim-fix-bufferoverflow.patch Summary: A multilingual input method library @@ -179,9 +181,7 @@ many languages using the input table map from m17n-db. %prep -%setup -q -%patch1 -p1 -b .1-emacs -%patch2 -p1 -b .2-libgcroots +%autosetup -p1 autoconf @@ -365,7 +365,7 @@ 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-openssl.so %{_libdir}/uim/plugin/libuim-process.so %{_libdir}/uim/plugin/libuim-socket.so %{_libdir}/uim/plugin/libuim-sqlite3.so @@ -474,6 +474,10 @@ fi %dir %{_datadir}/uim %changelog +* Tue Feb 27 2018 Akira TAGOH - 1.8.6-17 +- Add BR: gcc gcc-c++ +- Fix the buffer overflow. (#1549478) + * Wed Feb 14 2018 Akira TAGOH - 1.8.6-16 - Fix the build fail. - Disable uim-kde sub-package. From 7281524195ee1697f5ee0c94f8dc3dce96d189ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 14 Jul 2018 08:10:59 +0000 Subject: [PATCH 29/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index f1ef326..146e4e6 100644 --- a/uim.spec +++ b/uim.spec @@ -3,7 +3,7 @@ Name: uim Version: 1.8.6 -Release: 17%{?dist} +Release: 18%{?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+ @@ -474,6 +474,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jul 14 2018 Fedora Release Engineering - 1.8.6-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Tue Feb 27 2018 Akira TAGOH - 1.8.6-17 - Add BR: gcc gcc-c++ - Fix the buffer overflow. (#1549478) From e6bedad5a3bfaf795e84a5d3abef585ad2f79b26 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 28 Aug 2018 06:38:00 +0000 Subject: [PATCH 30/68] Make canna subpackage conditional. --- uim.spec | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/uim.spec b/uim.spec index 146e4e6..dfb90bd 100644 --- a/uim.spec +++ b/uim.spec @@ -1,9 +1,11 @@ %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 +%bcond_with canna + Name: uim Version: 1.8.6 -Release: 18%{?dist} +Release: 19%{?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+ @@ -14,7 +16,10 @@ 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: anthy-devel Canna-devel eb-devel gettext desktop-file-utils +%if %{with canna} +BuildRequires: Canna-devel +%endif +BuildRequires: anthy-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 @@ -90,6 +95,7 @@ Requires: uim = %{version}-%{release} Requires(post): gtk3 /usr/bin/uim-module-manager Requires(postun): gtk3 /usr/bin/uim-module-manager +%if %{with canna} %package canna Summary: Canna support for Uim Group: System Environment/Libraries @@ -97,6 +103,7 @@ Requires: Canna Requires: uim = %{version}-%{release} Requires(post): gtk3 /usr/bin/uim-module-manager Requires(postun): gtk3 /usr/bin/uim-module-manager +%endif # with canna %package skk Summary: SKK support for Uim @@ -169,8 +176,10 @@ This package provides the KDE applet. %description anthy This package provides support for Anthy, a Japanese input method. +%if %{with canna} %description canna This package provides support for Canna, a Japanese input method. +%endif %description skk This package provides support for SKK, a Japanese input method. @@ -187,7 +196,9 @@ autoconf %build %configure --with-x --with-xft \ +%if %{with canna} --with-canna \ +%endif --with-anthy --with-anthy-utf8 \ --with-m17nlib \ --with-eb --with-eb-conf=%{_libdir}/eb.conf \ @@ -283,6 +294,7 @@ if [ "$1" = "0" ]; then /usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --unregister anthy-utf8 > /dev/null 2>&1 || : fi +%if %{with canna} %post canna /usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --register canna > /dev/null 2>&1 || : @@ -290,6 +302,7 @@ fi if [ "$1" = "0" ]; then /usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --unregister canna > /dev/null 2>&1 || : fi +%endif %post skk /usr/bin/uim-module-manager --path %{_localstatedir}/lib/uim --register skk > /dev/null 2>&1 || : @@ -445,6 +458,7 @@ fi %{_datadir}/uim/pixmaps/anthy*.png %dir %{_datadir}/uim +%if %{with canna} %files canna %doc AUTHORS ChangeLog* NEWS README %license COPYING @@ -452,6 +466,7 @@ fi # BSD or LGPLv2 %{_datadir}/uim/pixmaps/canna.png %dir %{_datadir}/uim +%endif %files skk %doc AUTHORS ChangeLog* NEWS README @@ -474,6 +489,9 @@ fi %dir %{_datadir}/uim %changelog +* Tue Aug 28 2018 Akira TAGOH - 1.8.6-19 +- Make canna subpackage conditional. + * Sat Jul 14 2018 Fedora Release Engineering - 1.8.6-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From f77cf0eb0a2f4d531643f2eea5ff291b03224789 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 7 Nov 2018 11:31:56 +0000 Subject: [PATCH 31/68] Add Obsoletes: uim-canna to uim package. (#1635455) --- uim.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index dfb90bd..a93e1d8 100644 --- a/uim.spec +++ b/uim.spec @@ -5,7 +5,7 @@ Name: uim Version: 1.8.6 -Release: 19%{?dist} +Release: 20%{?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+ @@ -47,6 +47,9 @@ Provides: emacs-%{name} <= 1.8.6-7, emacs-%{name}-el <= 1.8.6-7 Obsoletes: emacs-%{name} <= 1.8.6-7, emacs-%{name}-el <= 1.8.6-7 Provides: xemacs-%{name} <= 1.8.6-7, xemacs-%{name}-el <= 1.8.6-7 Obsoletes: xemacs-%{name} <= 1.8.6-7, xemacs-%{name}-el <= 1.8.6-7 +%if %{without canna} +Obsoletes: %{name}-canna < %{version}-%{release} +%endif %package devel Summary: Development files for the Uim library @@ -489,6 +492,9 @@ fi %dir %{_datadir}/uim %changelog +* Wed Nov 07 2018 Akira TAGOH - 1.8.6-20 +- Add Obsoletes: uim-canna to uim package. (#1635455) + * Tue Aug 28 2018 Akira TAGOH - 1.8.6-19 - Make canna subpackage conditional. From e914d5d23af9a579fd1e279ace3bba6dd8c6b8fa Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 22 Jan 2019 06:37:55 +0000 Subject: [PATCH 32/68] New upstream release. --- sources | 2 +- uim.spec | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sources b/sources index c9d0369..8bda338 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecea4c597bab1fd4ba98ea84edcece59 uim-1.8.6.tar.bz2 +SHA512 (uim-1.8.8.tar.bz2) = 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3 diff --git a/uim.spec b/uim.spec index a93e1d8..6f74f16 100644 --- a/uim.spec +++ b/uim.spec @@ -4,8 +4,8 @@ %bcond_with canna Name: uim -Version: 1.8.6 -Release: 20%{?dist} +Version: 1.8.8 +Release: 1%{?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+ @@ -339,7 +339,9 @@ fi %{_bindir}/uim-module-manager %{_bindir}/uim-sh %{_bindir}/uim-xim -%{_libdir}/lib*.so.* +%{_libdir}/libuim-custom.so.2* +%{_libdir}/libuim-scm.so.0* +%{_libdir}/libuim.so.8* %{_datadir}/uim/byeoru-data/byeoru-dict %{_datadir}/uim/helperdata %{_datadir}/uim/tables/*.table @@ -492,6 +494,9 @@ fi %dir %{_datadir}/uim %changelog +* Tue Jan 22 2019 Akira TAGOH - 1.8.8-1 +- New upstream release. + * Wed Nov 07 2018 Akira TAGOH - 1.8.6-20 - Add Obsoletes: uim-canna to uim package. (#1635455) From db6e146bc7a96ccedabb53ff0f71acae1795f23b Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 22 Jan 2019 06:54:39 +0000 Subject: [PATCH 33/68] New upstream release. --- uim.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/uim.spec b/uim.spec index 6f74f16..7766250 100644 --- a/uim.spec +++ b/uim.spec @@ -30,7 +30,6 @@ Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch -Patch2: uim-enable-libgcroots.patch Patch3: uim-fix-bufferoverflow.patch From 9c6dc18334e67ff3e9abfa573607da34a44f51d5 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 22 Jan 2019 06:58:38 +0000 Subject: [PATCH 34/68] New upstream release. --- uim.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/uim.spec b/uim.spec index 7766250..44fba78 100644 --- a/uim.spec +++ b/uim.spec @@ -30,7 +30,6 @@ Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch -Patch3: uim-fix-bufferoverflow.patch Summary: A multilingual input method library From 282a9db8b37f81fcf07193464fea240d974ceae6 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 22 Jan 2019 08:15:00 +0000 Subject: [PATCH 35/68] New upstream release. --- uim.spec | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/uim.spec b/uim.spec index 44fba78..8cb25b2 100644 --- a/uim.spec +++ b/uim.spec @@ -268,9 +268,6 @@ cat png.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang find $RPM_BUILD_ROOT -name "*.svg" -type f | egrep -v ".*/(anthy|canna|m17n|mana|prime|scim|sj3|skk|wnn)" > svg.list cat svg.list | sed -e s,$RPM_BUILD_ROOT,,g >> %{name}.lang -# compress large doc -bzip2 ChangeLog - %post /sbin/ldconfig @@ -323,7 +320,7 @@ fi %files -f %{name}.lang -%doc AUTHORS ChangeLog* NEWS README fep/README.fep fep/README.fep.key xim/README.xim +%doc AUTHORS NEWS README fep/README.fep fep/README.fep.key xim/README.xim %license COPYING %lang(ja) %doc fep/README.fep.ja %dir %{_libdir}/uim @@ -398,14 +395,14 @@ fi %{_datadir}/xemacs/site-packages/lisp/site-start.d/uim-init.el %files devel -%doc AUTHORS ChangeLog* NEWS README +%doc AUTHORS NEWS README %license COPYING %{_includedir}/uim/ %{_libdir}/lib*.so %{_libdir}/pkgconfig/* %files gtk2 -%doc AUTHORS ChangeLog* NEWS README +%doc AUTHORS NEWS README %license COPYING # BSD %{_bindir}/uim-toolbar-gtk @@ -421,7 +418,7 @@ fi %{_libexecdir}/uim-candwin-tbl-gtk %files gtk3 -%doc AUTHORS ChangeLog* NEWS README +%doc AUTHORS NEWS README %license COPYING %{_bindir}/uim-im-switcher-gtk3 %{_bindir}/uim-input-pad-ja-gtk3 @@ -434,7 +431,7 @@ fi %{_libexecdir}/uim-candwin-tbl-gtk3 %files qt -%doc AUTHORS ChangeLog* NEWS +%doc AUTHORS NEWS %license COPYING %{_bindir}/uim-chardict-qt4 %{_bindir}/uim-im-switcher-qt4 @@ -445,14 +442,14 @@ fi %if 0 %files kde -%doc AUTHORS ChangeLog* NEWS README +%doc AUTHORS NEWS README %license COPYING %{_libdir}/kde4/plasma_applet_uim.so %{_datadir}/kde4/services/plasma-applet-uim.desktop %endif %files anthy -%doc AUTHORS ChangeLog* NEWS README +%doc AUTHORS NEWS README %license COPYING %{_libdir}/uim/plugin/libuim-anthy.so %{_libdir}/uim/plugin/libuim-anthy-utf8.so @@ -463,7 +460,7 @@ fi %if %{with canna} %files canna -%doc AUTHORS ChangeLog* NEWS README +%doc AUTHORS NEWS README %license COPYING %{_datadir}/uim/canna*.scm # BSD or LGPLv2 @@ -472,7 +469,7 @@ fi %endif %files skk -%doc AUTHORS ChangeLog* NEWS README +%doc AUTHORS NEWS README %license COPYING %{_libdir}/uim/plugin/libuim-skk.so %{_datadir}/uim/skk*.scm @@ -481,7 +478,7 @@ fi %dir %{_datadir}/uim %files m17n -%doc AUTHORS ChangeLog* NEWS README +%doc AUTHORS NEWS README %license COPYING %{_bindir}/uim-m17nlib-relink-icons %{_libdir}/uim/plugin/libuim-m17nlib.so From cfff39ad5379ca9f5a7522a74851d00d074967aa Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 22 Jan 2019 08:34:51 +0000 Subject: [PATCH 36/68] New upstream release. --- uim.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/uim.spec b/uim.spec index 8cb25b2..332a6f6 100644 --- a/uim.spec +++ b/uim.spec @@ -197,6 +197,7 @@ autoconf %build %configure --with-x --with-xft \ + --with-libgcroots=installed \ %if %{with canna} --with-canna \ %endif @@ -239,6 +240,8 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm #rm -rf $RPM_BUILD_ROOT%{_libdir}/kde3/*.la #rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/kicker/applets/uimapplet.desktop +rm $RPM_BUILD_ROOT%{_datadir}/uim/scim.scm +rm $RPM_BUILD_ROOT%{_datadir}/uim/pixmaps/scim.{svg,png} install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf @@ -382,6 +385,7 @@ fi %{_libdir}/uim/plugin/libuim-process.so %{_libdir}/uim/plugin/libuim-socket.so %{_libdir}/uim/plugin/libuim-sqlite3.so +%{_libdir}/uim/plugin/libuim-xkb.so %{_libexecdir}/uim-helper-server %{_mandir}/man1/uim-xim.1* %doc emacs/README From 2cbf19c13a8b23ba44d27092226b148324626a96 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 22 Jan 2019 08:46:11 +0000 Subject: [PATCH 37/68] New upstream release. --- uim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uim.spec b/uim.spec index 332a6f6..b5cdce5 100644 --- a/uim.spec +++ b/uim.spec @@ -240,8 +240,8 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/sigscheme rm -rf $RPM_BUILD_ROOT%{_datadir}/uim/{installed-modules,loader}.scm #rm -rf $RPM_BUILD_ROOT%{_libdir}/kde3/*.la #rm -rf $RPM_BUILD_ROOT%{_datadir}/apps/kicker/applets/uimapplet.desktop -rm $RPM_BUILD_ROOT%{_datadir}/uim/scim.scm -rm $RPM_BUILD_ROOT%{_datadir}/uim/pixmaps/scim.{svg,png} +rm $RPM_BUILD_ROOT%{_datadir}/uim/scim.scm || : +rm $RPM_BUILD_ROOT%{_datadir}/uim/pixmaps/scim.{svg,png} || : install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf From 7838369fbb2a12601a1f300de8287289a7aa0ed2 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:18:29 +0100 Subject: [PATCH 38/68] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- uim.spec | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/uim.spec b/uim.spec index b5cdce5..c9943c6 100644 --- a/uim.spec +++ b/uim.spec @@ -33,7 +33,6 @@ Patch1: uim-emacs-utf8.patch Summary: A multilingual input method library -Group: System Environment/Libraries Requires(post): %{_sbindir}/update-alternatives /sbin/ldconfig Requires(postun): %{_sbindir}/update-alternatives /sbin/ldconfig Requires: imsettings im-chooser @@ -51,12 +50,10 @@ Obsoletes: %{name}-canna < %{version}-%{release} %package devel Summary: Development files for the Uim library -Group: Development/Libraries Requires: uim = %{version}-%{release} %package gtk2 Summary: GTK+2 support for Uim -Group: User Interface/Desktops Requires: uim = %{version}-%{release} # for update-gtk-immodules Requires(post): gtk2 >= 2.9.1-2 @@ -65,7 +62,6 @@ Obsoletes: %{name}-gnome < 1.8.5-4 %package gtk3 Summary: GTK+3 support for Uim -Group: User Interface/Desktops Requires: uim = %{version}-%{release} # for update-gtk-immodules Requires(post): gtk3 @@ -74,14 +70,12 @@ Obsoletes: %{name}-gnome < 1.8.5-4 %package qt Summary: Qt4 support for Uim -Group: User Interface/Desktops Provides: uim-qt3 = %{version}-%{release} Obsoletes: uim-qt3 < 1.8.6-11 %if 0 %package kde Summary: KDE Applet for Uim -Group: User Interface/Desktops Requires: uim = %{version}-%{release} Requires: uim-qt Provides: uim-kde3 = %{version}-%{release} @@ -90,7 +84,6 @@ Obsoletes: uim-kde3 < 1.8.6-11 %package anthy Summary: Anthy support for Uim -Group: System Environment/Libraries Requires: anthy >= 9100h-11 Requires: uim = %{version}-%{release} Requires(post): gtk3 /usr/bin/uim-module-manager @@ -99,7 +92,6 @@ Requires(postun): gtk3 /usr/bin/uim-module-manager %if %{with canna} %package canna Summary: Canna support for Uim -Group: System Environment/Libraries Requires: Canna Requires: uim = %{version}-%{release} Requires(post): gtk3 /usr/bin/uim-module-manager @@ -108,7 +100,6 @@ Requires(postun): gtk3 /usr/bin/uim-module-manager %package skk Summary: SKK support for Uim -Group: System Environment/Libraries Requires: skkdic Requires: uim = %{version}-%{release} Requires(post): gtk3 /usr/bin/uim-module-manager @@ -116,7 +107,6 @@ Requires(postun): gtk3 /usr/bin/uim-module-manager %package m17n Summary: m17n-lib support for Uim -Group: System Environment/Libraries Requires: uim = %{version}-%{release} Requires(post): gtk3 /usr/bin/uim-module-manager Requires(postun): gtk3 /usr/bin/uim-module-manager From 787b87597846a6050f52319f52f490a3f32cd733 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 10:43:39 +0000 Subject: [PATCH 39/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index c9943c6..0d06649 100644 --- a/uim.spec +++ b/uim.spec @@ -5,7 +5,7 @@ Name: uim Version: 1.8.8 -Release: 1%{?dist} +Release: 2%{?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+ @@ -483,6 +483,9 @@ fi %dir %{_datadir}/uim %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.8.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Tue Jan 22 2019 Akira TAGOH - 1.8.8-1 - New upstream release. From 11476c55b78c0f19c663a17ac089665643f6b11c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 02:23:59 +0000 Subject: [PATCH 40/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 0d06649..fefa252 100644 --- a/uim.spec +++ b/uim.spec @@ -5,7 +5,7 @@ Name: uim Version: 1.8.8 -Release: 2%{?dist} +Release: 3%{?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+ @@ -483,6 +483,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.8.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 03 2019 Fedora Release Engineering - 1.8.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From ab5f79fe0fafbeb31e21e93571b0d8222ab45a01 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 02:30:57 +0000 Subject: [PATCH 41/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index fefa252..fec987c 100644 --- a/uim.spec +++ b/uim.spec @@ -5,7 +5,7 @@ Name: uim Version: 1.8.8 -Release: 3%{?dist} +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+ @@ -483,6 +483,9 @@ fi %dir %{_datadir}/uim %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 1.8.8-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jul 27 2019 Fedora Release Engineering - 1.8.8-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 8aa82d53a01d1c665e42300ba9b5e1d5eabb8e0a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:13:46 +0000 Subject: [PATCH 42/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index fec987c..c4c3bc7 100644 --- a/uim.spec +++ b/uim.spec @@ -5,7 +5,7 @@ Name: uim Version: 1.8.8 -Release: 4%{?dist} +Release: 5%{?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+ @@ -483,6 +483,9 @@ fi %dir %{_datadir}/uim %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 1.8.8-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jan 31 2020 Fedora Release Engineering - 1.8.8-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 0fab762eb530c75aee166a3c0d75bb99aef124e3 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 28 Aug 2020 21:13:06 +0900 Subject: [PATCH 43/68] Rebase to snapshot of git 0c2fbfa6. Fix aborting in emacs. Resolves: rhbz#1872512 --- sources | 2 +- uim.spec | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sources b/sources index 8bda338..50c91d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uim-1.8.8.tar.bz2) = 2257ae48f4f2b79039a5f6be0fc740e218d5609e004dad9a5a1aa5d4066587ee59d0be06bc23c7d567a48901466227fedc4778b480f7184d84b0b3b4dddac9a3 +SHA512 (uim-1.8.9-git0c2fbfa6.tar.bz2) = 732f65592c6b5cee1f7fbb4213fd716c2e58a5f1ee19575cc0be48e32f30cd21e6402369d6680cde45fc08fa26614096d4192dd92b1f6b54339490044f4177cd diff --git a/uim.spec b/uim.spec index c4c3bc7..adc7cb3 100644 --- a/uim.spec +++ b/uim.spec @@ -1,11 +1,13 @@ %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 snap git0c2fbfa6 %bcond_with canna Name: uim Version: 1.8.8 -Release: 5%{?dist} +Release: 6.20200828%{snap}%{?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+ @@ -26,7 +28,7 @@ BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras BuildRequires: emacs libtool automake autoconf intltool xemacs BuildRequires: gcc gcc-c++ -Source0: http://uim.googlecode.com/files/%{name}-%{version}.tar.bz2 +Source0: http://uim.googlecode.com/files/%{name}-%{srcver}-%{snap}.tar.bz2 Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch @@ -181,7 +183,7 @@ many languages using the input table map from m17n-db. %prep -%autosetup -p1 +%autosetup -p1 -n uim-%{srcver} autoconf @@ -483,6 +485,11 @@ fi %dir %{_datadir}/uim %changelog +* Fri Aug 28 2020 Akira TAGOH - 1.8.8-6.20200828git0c2fbfa6 +- Rebase to snapshot of git 0c2fbfa6. +- Fix aborting in emacs. + Resolves: rhbz#1872512 + * Wed Jul 29 2020 Fedora Release Engineering - 1.8.8-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 63be8daca6b099aa5d2c6ed4a059b7bdb9d3aa72 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:37:06 +0000 Subject: [PATCH 44/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index adc7cb3..2a901fa 100644 --- a/uim.spec +++ b/uim.spec @@ -7,7 +7,7 @@ Name: uim Version: 1.8.8 -Release: 6.20200828%{snap}%{?dist} +Release: 7.20200828%{snap}%{?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+ @@ -485,6 +485,9 @@ fi %dir %{_datadir}/uim %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 1.8.8-7.20200828git0c2fbfa6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Aug 28 2020 Akira TAGOH - 1.8.8-6.20200828git0c2fbfa6 - Rebase to snapshot of git 0c2fbfa6. - Fix aborting in emacs. From 384a8b06857167a81b708006b0fb847fe1267a12 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 19:58:57 +0000 Subject: [PATCH 45/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 2a901fa..9c7e8e8 100644 --- a/uim.spec +++ b/uim.spec @@ -7,7 +7,7 @@ Name: uim Version: 1.8.8 -Release: 7.20200828%{snap}%{?dist} +Release: 8.20200828%{snap}%{?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+ @@ -485,6 +485,9 @@ fi %dir %{_datadir}/uim %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 1.8.8-8.20200828git0c2fbfa6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Wed Jan 27 2021 Fedora Release Engineering - 1.8.8-7.20200828git0c2fbfa6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 5c9c67b195398749d48dcee4b02b46c1ee73dca7 Mon Sep 17 00:00:00 2001 From: Jerry James Date: Tue, 9 Nov 2021 21:52:41 -0700 Subject: [PATCH 46/68] Drop XEmacs support in F36 and later --- uim.spec | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/uim.spec b/uim.spec index 9c7e8e8..bdc2244 100644 --- a/uim.spec +++ b/uim.spec @@ -7,7 +7,7 @@ Name: uim Version: 1.8.8 -Release: 8.20200828%{snap}%{?dist} +Release: 9.20200828%{snap}%{?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+ @@ -26,7 +26,10 @@ BuildRequires: qt-devel cmake BuildRequires: libedit-devel libcurl-devel sqlite-devel expat-devel BuildRequires: m17n-lib-devel m17n-db-devel BuildRequires: m17n-db m17n-db-extras -BuildRequires: emacs libtool automake autoconf intltool xemacs +BuildRequires: emacs libtool automake autoconf intltool +%if 0%{?fedora} < 36 +BuildRequires: xemacs +%endif BuildRequires: gcc gcc-c++ Source0: http://uim.googlecode.com/files/%{name}-%{srcver}-%{snap}.tar.bz2 Source1: xinput.d-uim @@ -39,7 +42,9 @@ Requires(post): %{_sbindir}/update-alternatives /sbin/ldconfig Requires(postun): %{_sbindir}/update-alternatives /sbin/ldconfig Requires: imsettings im-chooser Requires: emacs-filesystem >= %{_emacs_version} +%if 0%{?fedora} < 36 Requires: xemacs-filesystem >= %{_xemacs_version} +%endif Provides: emacs-common-%{name} <= 1.8.6-7 Obsoletes: emacs-common-%{name} <= 1.8.6-7 Provides: emacs-%{name} <= 1.8.6-7, emacs-%{name}-el <= 1.8.6-7 @@ -213,8 +218,10 @@ LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs make %install LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/uim/.libs 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) +%endif # remove .desktop file (#240706) rm -f $RPM_BUILD_ROOT%{_datadir}/applications/uim.desktop @@ -239,8 +246,10 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d install -m 0644 -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinput.d/uim.conf install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d/ +%if 0%{?fedora} < 36 install -d $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d install -m 0644 -p %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/xemacs/site-packages/lisp/site-start.d/ +%endif cp -a fep/README fep/README.fep cp -a fep/README.ja fep/README.fep.ja @@ -387,8 +396,10 @@ fi %{_bindir}/uim-el-helper-agent %{_datadir}/emacs/site-lisp/uim-el %{_datadir}/emacs/site-lisp/site-start.d/uim-init.el +%if 0%{?fedora} < 36 %{_datadir}/xemacs/site-packages/lisp/uim-el %{_datadir}/xemacs/site-packages/lisp/site-start.d/uim-init.el +%endif %files devel %doc AUTHORS NEWS README @@ -485,6 +496,9 @@ fi %dir %{_datadir}/uim %changelog +* Tue Nov 9 2021 Jerry James - 1.8.8-9.20200828git0c2fbfa6 +- Drop XEmacs support in F36 and later + * Fri Jul 23 2021 Fedora Release Engineering - 1.8.8-8.20200828git0c2fbfa6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3d6332d9b1099235c83a9b80ee000d58b3050c86 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:27:58 +0000 Subject: [PATCH 47/68] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index bdc2244..93ea05c 100644 --- a/uim.spec +++ b/uim.spec @@ -7,7 +7,7 @@ Name: uim Version: 1.8.8 -Release: 9.20200828%{snap}%{?dist} +Release: 10.20200828%{snap}%{?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+ @@ -496,6 +496,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 1.8.8-10.20200828git0c2fbfa6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 9 2021 Jerry James - 1.8.8-9.20200828git0c2fbfa6 - Drop XEmacs support in F36 and later From 4661aa4149fcd7d54b6ef6d1ad3990105f4edc23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 11:19:50 +0000 Subject: [PATCH 48/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 93ea05c..206bd61 100644 --- a/uim.spec +++ b/uim.spec @@ -7,7 +7,7 @@ Name: uim Version: 1.8.8 -Release: 10.20200828%{snap}%{?dist} +Release: 11.20200828%{snap}%{?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+ @@ -496,6 +496,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 1.8.8-11.20200828git0c2fbfa6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 1.8.8-10.20200828git0c2fbfa6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From f408187fb19484ad512a1d9dbb608c8388494298 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Thu, 25 Aug 2022 16:49:17 +0900 Subject: [PATCH 49/68] New upstream release. Resolves: rhbz#2119935 --- sources | 2 +- uim.spec | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 50c91d5..e1f4fca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uim-1.8.9-git0c2fbfa6.tar.bz2) = 732f65592c6b5cee1f7fbb4213fd716c2e58a5f1ee19575cc0be48e32f30cd21e6402369d6680cde45fc08fa26614096d4192dd92b1f6b54339490044f4177cd +SHA512 (uim-1.8.9.tar.bz2) = 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df diff --git a/uim.spec b/uim.spec index 206bd61..243d740 100644 --- a/uim.spec +++ b/uim.spec @@ -1,13 +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 snap git0c2fbfa6 %bcond_with canna Name: uim -Version: 1.8.8 -Release: 11.20200828%{snap}%{?dist} +Version: 1.8.9 +Release: 1%{?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+ @@ -31,7 +30,7 @@ BuildRequires: emacs libtool automake autoconf intltool BuildRequires: xemacs %endif BuildRequires: gcc gcc-c++ -Source0: http://uim.googlecode.com/files/%{name}-%{srcver}-%{snap}.tar.bz2 +Source0: https://github.com/uim/uim/releases/download/%{version}/uim-%{version}.tar.bz2 Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch @@ -496,6 +495,10 @@ fi %dir %{_datadir}/uim %changelog +* Thu Aug 25 2022 Akira TAGOH - 1.8.9-1 +- New upstream release. + Resolves: rhbz#2119935 + * Sat Jul 23 2022 Fedora Release Engineering - 1.8.8-11.20200828git0c2fbfa6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From a0dd9688317cf2ff7e9c4dea682df6356f5f4f99 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Tue, 29 Nov 2022 19:38:51 +0100 Subject: [PATCH 50/68] Port configure script to C99 Related to: --- uim-configure-c99.patch | 20 ++++++++++++++++++++ uim.spec | 6 +++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 uim-configure-c99.patch diff --git a/uim-configure-c99.patch b/uim-configure-c99.patch new file mode 100644 index 0000000..e631421 --- /dev/null +++ b/uim-configure-c99.patch @@ -0,0 +1,20 @@ +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: + +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 +-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)], + [ diff --git a/uim.spec b/uim.spec index 243d740..5245f95 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.8.9 -Release: 1%{?dist} +Release: 2%{?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+ @@ -34,6 +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 Summary: A multilingual input method library @@ -495,6 +496,9 @@ fi %dir %{_datadir}/uim %changelog +* Tue Nov 29 2022 Florian Weimer - 1.8.9-2 +- Port configure script to C99 + * Thu Aug 25 2022 Akira TAGOH - 1.8.9-1 - New upstream release. Resolves: rhbz#2119935 From 0c69ea1365c0bf77499bc0a6cedcdf6feeec1985 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 5 Dec 2022 16:40:15 +0900 Subject: [PATCH 51/68] Convert License tag to SPDX. --- uim.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uim.spec b/uim.spec index 5245f95..2ac11c5 100644 --- a/uim.spec +++ b/uim.spec @@ -6,12 +6,12 @@ Name: uim Version: 1.8.9 -Release: 2%{?dist} +Release: 3%{?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+ # pixmaps/*.{svg,png} is licensed under BSD or LGPLv2 -License: BSD and LGPLv2+ and (BSD or LGPLv2) +License: BSD-3-Clause AND LGPL-2.1-or-later AND (BSD-3-Clause OR LGPL-2.1-or-later) URL: https://github.com/uim/uim/ BuildRequires: libXft-devel libX11-devel libXext-devel libXrender-devel libXau-devel libXdmcp-devel libXt-devel @@ -496,6 +496,9 @@ fi %dir %{_datadir}/uim %changelog +* Mon Dec 5 2022 Akira TAGOH - 1.8.9-3 +- Convert License tag to SPDX. + * Tue Nov 29 2022 Florian Weimer - 1.8.9-2 - Port configure script to C99 From 2f365c29ba965397b3cd30e0ee2ba2e610aaefe8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 05:45:10 +0000 Subject: [PATCH 52/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 2ac11c5..ac88ca6 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.8.9 -Release: 3%{?dist} +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+ @@ -496,6 +496,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 1.8.9-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Mon Dec 5 2022 Akira TAGOH - 1.8.9-3 - Convert License tag to SPDX. From 4cebac413e2e9cee4b45dd52e1d92daa594dc96b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 17:03:13 +0000 Subject: [PATCH 53/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index ac88ca6..2eaaec2 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.8.9 -Release: 4%{?dist} +Release: 5%{?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+ @@ -496,6 +496,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 1.8.9-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 1.8.9-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From a08ef0d0716262ccc48f39730a1ac2fdbf152f0b Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 28 Nov 2023 15:43:43 +0900 Subject: [PATCH 54/68] Fix symbol error on Emacs 29. Resolves: rhbz#2251120 --- uim-fix-emacs29.patch | 35 +++++++++++++++++++++++++++++++++++ uim.spec | 7 ++++++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 uim-fix-emacs29.patch diff --git a/uim-fix-emacs29.patch b/uim-fix-emacs29.patch new file mode 100644 index 0000000..e7af158 --- /dev/null +++ b/uim-fix-emacs29.patch @@ -0,0 +1,35 @@ +From 7b903ddf144344e49da12cc070f7c11f82ae61db Mon Sep 17 00:00:00 2001 +From: Sutou Kouhei +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 + diff --git a/uim.spec b/uim.spec index 2eaaec2..b83d3fe 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.8.9 -Release: 5%{?dist} +Release: 6%{?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+ @@ -35,6 +35,7 @@ Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch Patch2: uim-configure-c99.patch +Patch3: uim-fix-emacs29.patch Summary: A multilingual input method library @@ -496,6 +497,10 @@ fi %dir %{_datadir}/uim %changelog +* Tue Nov 28 2023 Akira TAGOH - 1.8.9-6 +- Fix symbol error on Emacs 29. + Resolves: rhbz#2251120 + * Sat Jul 22 2023 Fedora Release Engineering - 1.8.9-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 4b9d38bdba35d2f8a3aa381180cdca71034224bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 07:03:07 +0000 Subject: [PATCH 55/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index b83d3fe..5430829 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.8.9 -Release: 6%{?dist} +Release: 7%{?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+ @@ -497,6 +497,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 1.8.9-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 28 2023 Akira TAGOH - 1.8.9-6 - Fix symbol error on Emacs 29. Resolves: rhbz#2251120 From 9383fc99cacaf0385a7e3fbd1c1904257183f82d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 08:11:56 +0000 Subject: [PATCH 56/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 5430829..29e16fd 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.8.9 -Release: 7%{?dist} +Release: 8%{?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+ @@ -497,6 +497,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 1.8.9-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 1.8.9-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 97fefdf8d32b507749aeac93e7d6f711d89aa87f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 13:41:14 +0000 Subject: [PATCH 57/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 29e16fd..e12dcd2 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.8.9 -Release: 8%{?dist} +Release: 9%{?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+ @@ -497,6 +497,9 @@ fi %dir %{_datadir}/uim %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 1.8.9-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Sat Jul 20 2024 Fedora Release Engineering - 1.8.9-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From c732cd9515482db7074de3b66c8f58ae7e3069b7 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 29 Jan 2025 11:43:24 +0900 Subject: [PATCH 58/68] Fix FTBFS Resolves: rhbz#2341480 --- uim-ftbfs.patch | 283 ++++++++++++++++++++++++++++++++++++++++++++++++ uim.spec | 7 +- 2 files changed, 289 insertions(+), 1 deletion(-) create mode 100644 uim-ftbfs.patch diff --git a/uim-ftbfs.patch b/uim-ftbfs.patch new file mode 100644 index 0000000..6694f62 --- /dev/null +++ b/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 diff --git a/uim.spec b/uim.spec index e12dcd2..747aac1 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.8.9 -Release: 9%{?dist} +Release: 10%{?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+ @@ -36,6 +36,7 @@ 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 @@ -497,6 +498,10 @@ fi %dir %{_datadir}/uim %changelog +* Wed Jan 29 2025 Akira TAGOH - 1.8.9-10 +- Fix FTBFS + Resolves: rhbz#2341480 + * Sun Jan 19 2025 Fedora Release Engineering - 1.8.9-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From da6a855ee650175e95cbbfbfda09b3f6a785e414 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Wed, 5 Feb 2025 18:18:07 +0900 Subject: [PATCH 59/68] Drop LD_LIBRARY_PATH --- uim.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/uim.spec b/uim.spec index 747aac1..e2d4347 100644 --- a/uim.spec +++ b/uim.spec @@ -216,10 +216,10 @@ autoconf --enable-pref #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) From a04e9209207acf9da8d2ce4acbe33da17032d54a Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 25 Feb 2025 16:44:51 +0900 Subject: [PATCH 60/68] New upstream release. Resolves: rhbz#2347165 Disable OpenSSL support. OpenSSL plugin isn't packaged. should be no harm. --- sources | 1 + uim-configure-c99.patch | 20 -------------------- uim-fix-bufferoverflow.patch | 12 ------------ uim-fix-emacs29.patch | 35 ----------------------------------- uim.spec | 17 ++++++++++------- 5 files changed, 11 insertions(+), 74 deletions(-) delete mode 100644 uim-configure-c99.patch delete mode 100644 uim-fix-bufferoverflow.patch delete mode 100644 uim-fix-emacs29.patch diff --git a/sources b/sources index e1f4fca..30def35 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (uim-1.8.9.tar.bz2) = 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df +SHA512 (uim-1.9.0.tar.bz2) = f83aa3baf83131397ef495ed52270f6753273c058d6214acb0f08cf9d6e1698093b6325d8b6342352c3712f5177f690d387da3d24c60b3870ca78ec426a0f79e diff --git a/uim-configure-c99.patch b/uim-configure-c99.patch deleted file mode 100644 index e631421..0000000 --- a/uim-configure-c99.patch +++ /dev/null @@ -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: - -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 --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)], - [ diff --git a/uim-fix-bufferoverflow.patch b/uim-fix-bufferoverflow.patch deleted file mode 100644 index eff6d6f..0000000 --- a/uim-fix-bufferoverflow.patch +++ /dev/null @@ -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; - diff --git a/uim-fix-emacs29.patch b/uim-fix-emacs29.patch deleted file mode 100644 index e7af158..0000000 --- a/uim-fix-emacs29.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7b903ddf144344e49da12cc070f7c11f82ae61db Mon Sep 17 00:00:00 2001 -From: Sutou Kouhei -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 - diff --git a/uim.spec b/uim.spec index e2d4347..d090054 100644 --- a/uim.spec +++ b/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.0 %bcond_with canna Name: uim -Version: 1.8.9 -Release: 10%{?dist} +Version: 1.9.0 +Release: 1%{?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+ @@ -34,8 +34,6 @@ 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 @@ -210,7 +208,7 @@ autoconf --enable-kde4-applet \ --with-curl \ --with-expat \ - --enable-openssl --with-ssl-engine \ + --disable-openssl \ --with-sqlite3 \ --with-lispdir=%{_datadir}/emacs/site-lisp \ --enable-pref @@ -384,7 +382,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 @@ -498,6 +495,12 @@ fi %dir %{_datadir}/uim %changelog +* Tue Feb 25 2025 Akira TAGOH - 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 - 1.8.9-10 - Fix FTBFS Resolves: rhbz#2341480 From 5461bde704bb3319c34a4de098ad7c1c98c62d71 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Mon, 24 Mar 2025 21:03:22 +0900 Subject: [PATCH 61/68] Replace anthy with anthy-unicode --- uim-anthy-unicode.patch | 36 ++++++++++++++++++++++++++++++++++++ uim.spec | 16 ++++++++++------ 2 files changed, 46 insertions(+), 6 deletions(-) create mode 100644 uim-anthy-unicode.patch diff --git a/uim-anthy-unicode.patch b/uim-anthy-unicode.patch new file mode 100644 index 0000000..8ca68dd --- /dev/null +++ b/uim-anthy-unicode.patch @@ -0,0 +1,36 @@ +From c884468480d97bd99c758907595c6298a80c14e6 Mon Sep 17 00:00:00 2001 +From: Takao Fujiwara +Date: Sat, 22 Mar 2025 16:01:39 +0900 +Subject: [PATCH] configure: Support anthy-unicode (#189) + +Fix GH-166 +--- + configure.ac | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 282b1c61..de2d76c4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -142,11 +142,15 @@ AC_ARG_WITH(anthy-utf8, + [with_anthy_utf8=no]) + + if test "x$with_anthy_utf8" != xno; then +- PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622, ++ PKG_CHECK_MODULES(ANTHY_UTF8, anthy-unicode, + [with_anthy_utf8=yes + AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, +- [libanthy can handle UTF-8])], +- with_anthy_utf8=no) ++ [libanthy-unicode can handle UTF-8])], ++ [PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622, ++ [with_anthy_utf8=yes ++ AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, ++ [libanthy can handle UTF-8])], ++ with_anthy_utf8=no)]) + fi + + AM_CONDITIONAL(ANTHY_UTF8, test "x$with_anthy_utf8" = xyes) +-- +2.47.0 + diff --git a/uim.spec b/uim.spec index d090054..e84984e 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.9.0 -Release: 1%{?dist} +Release: 2%{?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+ @@ -20,7 +20,7 @@ BuildRequires: gtk2-devel 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 @@ -35,6 +35,8 @@ Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch Patch4: uim-ftbfs.patch +# https://github.com/uim/uim/pull/189 +Patch5: uim-anthy-unicode.patch Summary: A multilingual input method library @@ -91,7 +93,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 @@ -129,7 +131,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. @@ -198,7 +200,7 @@ autoconf %if %{with canna} --with-canna \ %endif - --with-anthy --with-anthy-utf8 \ + --with-anthy-utf8 \ --with-m17nlib \ --with-eb --with-eb-conf=%{_libdir}/eb.conf \ --without-scim \ @@ -457,7 +459,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 @@ -495,6 +496,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Mar 22 2025 Takao Fujiwara - 1.9.0-2 +- Replace anthy with anthy-unicode + * Tue Feb 25 2025 Akira TAGOH - 1.9.0-1 - New upstream release. Resolves: rhbz#2347165 From db36e567fa1e2868b15ee9dff30fabfcf1853765 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 25 Mar 2025 10:55:58 +0900 Subject: [PATCH 62/68] cleanup --- uim-enable-libgcroots.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 uim-enable-libgcroots.patch diff --git a/uim-enable-libgcroots.patch b/uim-enable-libgcroots.patch deleted file mode 100644 index 38e82f9..0000000 --- a/uim-enable-libgcroots.patch +++ /dev/null @@ -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 From 27220599824f43e52dc14fb73cab74dff38996d0 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Fri, 18 Apr 2025 16:03:15 +0900 Subject: [PATCH 63/68] New upstream release. Resolves: rhbz#2359276 --- sources | 3 +-- uim-anthy-unicode.patch | 36 ------------------------------------ uim.spec | 13 ++++++++----- 3 files changed, 9 insertions(+), 43 deletions(-) delete mode 100644 uim-anthy-unicode.patch diff --git a/sources b/sources index 30def35..1ed548b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (uim-1.8.9.tar.bz2) = 342bda32f27b9875bf1458adbfb3d3cdd92d98daf8068647e3cb01f9757fda6befbb44a7b9ba2b25b03e14b1de68c7e2d6b57362e84d6aae8bcff3959aaa12df -SHA512 (uim-1.9.0.tar.bz2) = f83aa3baf83131397ef495ed52270f6753273c058d6214acb0f08cf9d6e1698093b6325d8b6342352c3712f5177f690d387da3d24c60b3870ca78ec426a0f79e +SHA512 (uim-1.9.1.tar.bz2) = a9ef6d8f6ed1b6bfe497add3762bd65e4640355b539b9ad072759cc75d038ddfc2db9c5562d0250c6f69eae803e09cf9cac0765cc3ce478ded878ffc144d4569 diff --git a/uim-anthy-unicode.patch b/uim-anthy-unicode.patch deleted file mode 100644 index 8ca68dd..0000000 --- a/uim-anthy-unicode.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c884468480d97bd99c758907595c6298a80c14e6 Mon Sep 17 00:00:00 2001 -From: Takao Fujiwara -Date: Sat, 22 Mar 2025 16:01:39 +0900 -Subject: [PATCH] configure: Support anthy-unicode (#189) - -Fix GH-166 ---- - configure.ac | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 282b1c61..de2d76c4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -142,11 +142,15 @@ AC_ARG_WITH(anthy-utf8, - [with_anthy_utf8=no]) - - if test "x$with_anthy_utf8" != xno; then -- PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622, -+ PKG_CHECK_MODULES(ANTHY_UTF8, anthy-unicode, - [with_anthy_utf8=yes - AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, -- [libanthy can handle UTF-8])], -- with_anthy_utf8=no) -+ [libanthy-unicode can handle UTF-8])], -+ [PKG_CHECK_MODULES(ANTHY_UTF8, anthy >= 8622, -+ [with_anthy_utf8=yes -+ AC_DEFINE(LIBANTHY_UTF8_CAPABLE, 1, -+ [libanthy can handle UTF-8])], -+ with_anthy_utf8=no)]) - fi - - AM_CONDITIONAL(ANTHY_UTF8, test "x$with_anthy_utf8" = xyes) --- -2.47.0 - diff --git a/uim.spec b/uim.spec index e84984e..b5e67a4 100644 --- a/uim.spec +++ b/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.9.0 +%global srcver 1.9.1 %bcond_with canna Name: uim -Version: 1.9.0 -Release: 2%{?dist} +Version: 1.9.1 +Release: 1%{?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+ @@ -35,8 +35,6 @@ Source1: xinput.d-uim Source2: uim-init.el Patch1: uim-emacs-utf8.patch Patch4: uim-ftbfs.patch -# https://github.com/uim/uim/pull/189 -Patch5: uim-anthy-unicode.patch Summary: A multilingual input method library @@ -200,6 +198,7 @@ autoconf %if %{with canna} --with-canna \ %endif + --without-anthy \ --with-anthy-utf8 \ --with-m17nlib \ --with-eb --with-eb-conf=%{_libdir}/eb.conf \ @@ -496,6 +495,10 @@ fi %dir %{_datadir}/uim %changelog +* Fri Apr 18 2025 Akira TAGOH - 1.9.1-1 +- New upstream release. + Resolves: rhbz#2359276 + * Sat Mar 22 2025 Takao Fujiwara - 1.9.0-2 - Replace anthy with anthy-unicode From a9e64f5b6f834c1b8894dc27b4fc45fd7b88d968 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 13 May 2025 17:12:41 +0900 Subject: [PATCH 64/68] New upstream release. Resolves: rhbz#2363935 Upstream dropped gtk2 support. --- sources | 2 +- uim.spec | 49 ++++++++++++------------------------------------- 2 files changed, 13 insertions(+), 38 deletions(-) diff --git a/sources b/sources index 1ed548b..5a0fedf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uim-1.9.1.tar.bz2) = a9ef6d8f6ed1b6bfe497add3762bd65e4640355b539b9ad072759cc75d038ddfc2db9c5562d0250c6f69eae803e09cf9cac0765cc3ce478ded878ffc144d4569 +SHA512 (uim-1.9.5.tar.bz2) = e8d33db0526a547a31cbee1c525874917f669ff42b40e05b7b67ad5b84195faa9ac1d8cec87634ef3f1c2f3192991425a1727661e6c48d425c8e106ae1b3946f diff --git a/uim.spec b/uim.spec index b5e67a4..6b138b7 100644 --- a/uim.spec +++ b/uim.spec @@ -1,11 +1,11 @@ %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.9.1 +%global srcver 1.9.5 %bcond_with canna Name: uim -Version: 1.9.1 +Version: 1.9.5 Release: 1%{?dist} # uim itself is licensed under BSD # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h} @@ -16,7 +16,7 @@ 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 @@ -34,7 +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 -Patch4: uim-ftbfs.patch +#Patch4: uim-ftbfs.patch Summary: A multilingual input method library @@ -59,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} @@ -74,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 @@ -141,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 @@ -203,7 +189,6 @@ autoconf --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 \ @@ -212,7 +197,8 @@ autoconf --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 make @@ -408,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 @@ -495,6 +465,11 @@ fi %dir %{_datadir}/uim %changelog +* Tue May 13 2025 Akira TAGOH - 1.9.5-1 +- New upstream release. + Resolves: rhbz#2363935 +- Upstream dropped gtk2 support. + * Fri Apr 18 2025 Akira TAGOH - 1.9.1-1 - New upstream release. Resolves: rhbz#2359276 From 9d9a79835f50246ca24171f1da8fcac5e013f0d7 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Tue, 3 Jun 2025 16:05:49 +0900 Subject: [PATCH 65/68] New upstream release. Resolves: rhbz#2366917 --- sources | 2 +- uim.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/sources b/sources index 5a0fedf..0106ac4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (uim-1.9.5.tar.bz2) = e8d33db0526a547a31cbee1c525874917f669ff42b40e05b7b67ad5b84195faa9ac1d8cec87634ef3f1c2f3192991425a1727661e6c48d425c8e106ae1b3946f +SHA512 (uim-1.9.6.tar.bz2) = 6824b56116d4ad99802d349e4afc60eee143c8c25d8e1b32712989a020a647d9338e3f6d23a097c7725c67f0b62a3f8f3e217a40aac35c0076d3667723124210 diff --git a/uim.spec b/uim.spec index 6b138b7..18c7796 100644 --- a/uim.spec +++ b/uim.spec @@ -1,11 +1,11 @@ %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.9.5 +%global srcver 1.9.6 %bcond_with canna Name: uim -Version: 1.9.5 +Version: 1.9.6 Release: 1%{?dist} # uim itself is licensed under BSD # scm/py.scm, helper/eggtrayicon.[ch], qt/pref-kseparator.{cpp,h} @@ -465,6 +465,10 @@ fi %dir %{_datadir}/uim %changelog +* Tue Jun 3 2025 Akira TAGOH - 1.9.6-1 +- New upstream release. + Resolves: rhbz#2366917 + * Tue May 13 2025 Akira TAGOH - 1.9.5-1 - New upstream release. Resolves: rhbz#2363935 From 5002cd992154efc49b1f4a4f1d2b96fc4576e589 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 19:44:50 +0000 Subject: [PATCH 66/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 18c7796..ecb40a6 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.9.6 -Release: 1%{?dist} +Release: 2%{?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+ @@ -465,6 +465,9 @@ fi %dir %{_datadir}/uim %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 1.9.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jun 3 2025 Akira TAGOH - 1.9.6-1 - New upstream release. Resolves: rhbz#2366917 From b3fb96e02c0c48914dbf13687c1992ad411eaea1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 19:34:09 +0000 Subject: [PATCH 67/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index ecb40a6..203ff80 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.9.6 -Release: 2%{?dist} +Release: 3%{?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+ @@ -465,6 +465,9 @@ fi %dir %{_datadir}/uim %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 1.9.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 1.9.6-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 90bd41147af868bbb8ddb1878337fe4223be9be9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 08:08:41 +0000 Subject: [PATCH 68/68] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- uim.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uim.spec b/uim.spec index 203ff80..ad6e039 100644 --- a/uim.spec +++ b/uim.spec @@ -6,7 +6,7 @@ Name: uim Version: 1.9.6 -Release: 3%{?dist} +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+ @@ -465,6 +465,9 @@ fi %dir %{_datadir}/uim %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 1.9.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Jan 17 2026 Fedora Release Engineering - 1.9.6-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild