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

Fixes: https://src.fedoraproject.org/rpms/anthy-unicode/c/41d0118?branch=rawhide

.fmf/version

@@ -0,0 +1 @@
+1

anthy-unicode.spec

@@ -7,12 +7,6 @@
 %bcond_without xemacs
 %endif
 
-# emacs.i686 has not been available since emacs-29.4-7.fc40
-%ifarch i686
-%bcond_with    emacs
-%else
-%bcond_without emacs
-%endif
 
 Name:  anthy-unicode
 Version: 1.0.0.20240502
@@ -20,9 +14,7 @@ Release: %autorelease
 # The entire source code is LGPLv2+ and dictionaries is GPLv2. the corpus data is under Public Domain.
 License: LGPL-2.0-or-later AND GPL-2.0-or-later AND LicenseRef-Fedora-Public-Domain
 URL:  https://github.com/fujiwarat/anthy-unicode/wiki
-%if %{with emacs}
 BuildRequires: emacs
-%endif
 BuildRequires: gcc
 BuildRequires: git
 %if %{with xemacs}
@@ -53,7 +45,6 @@ user dictionaries and the users information which is used for the conversion,
 is stored into their own home directory. So Anthy Unicode is secure than
 other conversion server.
 
-%if %{with emacs}
 %package -n emacs-%{pkg}
 Summary: Emacs files for %{pkg}
 Requires: %{name} = %{version}-%{release}
@@ -63,7 +54,6 @@ BuildArch: noarch
 %description -n emacs-%{pkg}
 This package contains the byte compiled elips packages to run %{pkg}
 with GNU Emacs.
-%endif
 
 %if %{with xemacs}
 %package -n xemacs-%{pkg}
@@ -107,18 +97,21 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 # remove unnecessary files
 rm $RPM_BUILD_ROOT%{_libdir}/lib*.la
 
-%if %{with emacs}
+pushd ./src-util
+install -m 644 dic-tool-input $RPM_BUILD_ROOT%{_datadir}/%{pkg}
+install -m 644 dic-tool-result $RPM_BUILD_ROOT%{_datadir}/%{pkg}
+popd
+
 ## for emacs-anthy
 mkdir -p $RPM_BUILD_ROOT%{_emacs_sitestartdir}
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir}
-%endif
 
 %if %{with xemacs}
 ## for xemacs-anthy
 mkdir -p $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_xemacs_sitestartdir}
 # FIXME lisp build
-pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util
+pushd ./src-util
 make clean
 #make EMACS=xemacs lispdir="%%{_xemacs_sitelispdir}/%%{pkg}"
 # The latest /usr/share/automake-*/am/lisp.am calls -L option for
@@ -160,14 +153,12 @@ cd ..
 %{_libdir}/lib*.so.*
 %{_datadir}/%{pkg}/
 
-%if %{with emacs}
 %files -n emacs-%{pkg}
 %doc doc/ELISP
 %{_emacs_sitelispdir}/%{pkg}/*.el
 %{_emacs_sitelispdir}/%{pkg}/*.elc
 %{_emacs_sitestartdir}/*.el
 %dir %{_emacs_sitelispdir}/%{pkg}
-%endif
 
 %if %{with xemacs}
 %files -n xemacs-%{pkg}
@@ -182,6 +173,8 @@ cd ..
 
 %files devel
 %doc doc/DICLIB doc/DICUTIL doc/GLOSSARY doc/GRAMMAR doc/GUIDE.english doc/ILIB doc/LEARNING doc/LIB doc/MISC doc/POS doc/SPLITTER doc/TESTING doc/protocol.txt
+%{_datadir}/%{pkg}/dic-tool-input
+%{_datadir}/%{pkg}/dic-tool-result
 %{_includedir}/*
 %{_libdir}/lib*.so
 %{_libdir}/pkgconfig/*.pc

plans/dict-test.fmf

@@ -0,0 +1,5 @@
+summary: anthy-unicode test
+discover:
+    how: fmf
+execute:
+    how: tmt

tests/migration/main.fmf

@@ -0,0 +1,5 @@
+summary: Migration tests of private dicts from anthy to anthy-unicode
+test: ./test.sh
+framework: beakerlib
+require:
+    - anthy-unicode-devel

tests/migration/test.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+[ -d $HOME/.anthy ] || mkdir $HOME/.anthy
+
+rlJournalStart
+    rlPhaseStartTest
+        rlRun -t "anthy-dic-tool-unicode --load /usr/share/anthy-unicode/dic-tool-input"
+        rlRun -t "diff $HOME/.config/anthy/private_words_default /usr/share/anthy-unicode/dic-tool-result"
+        rlRun -t "anthy-dic-tool-unicode --dump"
+        rlRun -t "mv $HOME/.config/anthy/private_words_default $HOME/.anthy"
+        rlRun -t "anthy-dic-tool-unicode --migrate"
+        rlRun -t "diff $HOME/.config/anthy/private_words_default /usr/share/anthy-unicode/dic-tool-result"
+    rlPhaseEnd
+rlJournalEnd

tests/tests.sh

@@ -1,12 +0,0 @@
-#!/bin/sh
-
-: ${SRCDIR:='./source'}
-
-anthy-dic-tool-unicode --load $SRCDIR/src-util/dic-tool-input
-diff $HOME/.config/anthy/private_words_default $SRCDIR/src-util/dic-tool-result
-anthy-dic-tool-unicode --dump
-[ -d $HOME/.anthy ] || mkdir $HOME/.anthy
-mv $HOME/.config/anthy/private_words_default $HOME/.anthy
-anthy-dic-tool-unicode --migrate
-diff $HOME/.config/anthy/private_words_default $SRCDIR/src-util/dic-tool-result
-

tests/tests.yml

@@ -1,19 +0,0 @@
-- hosts: localhost
-  tags:
-    - classic
-  roles:
-  - role: standard-test-source
-    required_packages:
-    - git
-    vars:
-      fetch_only: True
-  - role: standard-test-basic
-  #- role: standard-test-beakerlib
-    required_packages:
-    - bash
-    - anthy-unicode
-    tests:
-    - smoke1:
-        dir: .
-        run: ./tests.sh
-