diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 587d7f2..842170f 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -7,6 +7,12 @@ %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 @@ -14,7 +20,9 @@ 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} @@ -45,6 +53,7 @@ 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} @@ -54,6 +63,7 @@ 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} @@ -97,21 +107,18 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" # remove unnecessary files rm $RPM_BUILD_ROOT%{_libdir}/lib*.la -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 - +%if %{with emacs} ## 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 ./src-util +pushd $RPM_BUILD_DIR/%{name}-%{version}/src-util make clean #make EMACS=xemacs lispdir="%%{_xemacs_sitelispdir}/%%{pkg}" # The latest /usr/share/automake-*/am/lisp.am calls -L option for @@ -153,12 +160,14 @@ 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} @@ -173,8 +182,6 @@ 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 diff --git a/plans/dict-test.fmf b/plans/dict-test.fmf deleted file mode 100644 index 9c5ae63..0000000 --- a/plans/dict-test.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: anthy-unicode test -discover: - how: fmf -execute: - how: tmt diff --git a/tests/migration/main.fmf b/tests/migration/main.fmf deleted file mode 100644 index bc2c7a7..0000000 --- a/tests/migration/main.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Migration tests of private dicts from anthy to anthy-unicode -test: ./test.sh -framework: beakerlib -require: - - anthy-unicode-devel diff --git a/tests/migration/test.sh b/tests/migration/test.sh deleted file mode 100755 index a1bd50c..0000000 --- a/tests/migration/test.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/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 diff --git a/tests/tests.sh b/tests/tests.sh new file mode 100755 index 0000000..9d18fcd --- /dev/null +++ b/tests/tests.sh @@ -0,0 +1,12 @@ +#!/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 + diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..c5f451c --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,19 @@ +- 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 +