From 235965806601daf0231a8a54f833a20f8295185e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:06:56 +0000 Subject: [PATCH 1/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b275bea1863e8ca4df6bae36c108a14797e9b1a0 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 16 Aug 2024 11:08:08 +0900 Subject: [PATCH 2/8] Delete CI with STI CI with STI is archived in: https://src.fedoraproject.org/rpms/anthy-unicode/tree/ci-sti --- tests/tests.sh | 12 ------------ tests/tests.yml | 19 ------------------- 2 files changed, 31 deletions(-) delete mode 100755 tests/tests.sh delete mode 100644 tests/tests.yml diff --git a/tests/tests.sh b/tests/tests.sh deleted file mode 100755 index 9d18fcd..0000000 --- a/tests/tests.sh +++ /dev/null @@ -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 - diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index c5f451c..0000000 --- a/tests/tests.yml +++ /dev/null @@ -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 - From cbe7995d7ca0141d93fd9882349952465aeb6060 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 16 Aug 2024 20:23:11 +0900 Subject: [PATCH 3/8] Implement CI with TMT - Add dic-tool-* test files to devel package --- .fmf/version | 1 + anthy-unicode.spec | 9 ++++++++- plans/dict-test.fmf | 5 +++++ tests/migration/main.fmf | 15 +++++++++++++++ tests/migration/test.sh | 16 ++++++++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 .fmf/version create mode 100644 plans/dict-test.fmf create mode 100644 tests/migration/main.fmf create mode 100755 tests/migration/test.sh diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 842170f..0bfba64 100644 --- a/anthy-unicode.spec +++ b/anthy-unicode.spec @@ -107,6 +107,11 @@ 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} @@ -118,7 +123,7 @@ install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_emacs_sitestartdir} 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 @@ -182,6 +187,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 diff --git a/plans/dict-test.fmf b/plans/dict-test.fmf new file mode 100644 index 0000000..9c5ae63 --- /dev/null +++ b/plans/dict-test.fmf @@ -0,0 +1,5 @@ +summary: anthy-unicode test +discover: + how: fmf +execute: + how: tmt diff --git a/tests/migration/main.fmf b/tests/migration/main.fmf new file mode 100644 index 0000000..843d404 --- /dev/null +++ b/tests/migration/main.fmf @@ -0,0 +1,15 @@ +summary: Migration tests of private dicts from anthy to anthy-unicode +test: ./test.sh +framework: beakerlib +require: + - anthy-unicode + - anthy-unicode-devel + - autoconf + - automake + - emacs + - fedpkg + - gcc + - git + - libtool + - make + - rpm-build diff --git a/tests/migration/test.sh b/tests/migration/test.sh new file mode 100755 index 0000000..a1bd50c --- /dev/null +++ b/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 From 4f8244a770aa3e624bbdd562c044a532d0a5225e Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Fri, 16 Aug 2024 20:27:23 +0900 Subject: [PATCH 4/8] Revert to drop emacs.i686 Fixes: https://src.fedoraproject.org/rpms/anthy-unicode/c/41d0118?branch=rawhide --- anthy-unicode.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/anthy-unicode.spec b/anthy-unicode.spec index 0bfba64..587d7f2 100644 --- a/anthy-unicode.spec +++ b/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} @@ -112,11 +102,9 @@ 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 @@ -165,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} From 024c975b7d403c5362ef6416d63501b1e222eb92 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Sat, 17 Aug 2024 13:13:03 +0900 Subject: [PATCH 5/8] Delete unnecessary packages in CI --- tests/migration/main.fmf | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/tests/migration/main.fmf b/tests/migration/main.fmf index 843d404..bc2c7a7 100644 --- a/tests/migration/main.fmf +++ b/tests/migration/main.fmf @@ -2,14 +2,4 @@ summary: Migration tests of private dicts from anthy to anthy-unicode test: ./test.sh framework: beakerlib require: - - anthy-unicode - anthy-unicode-devel - - autoconf - - automake - - emacs - - fedpkg - - gcc - - git - - libtool - - make - - rpm-build From 837491e30831903b1f447971c3c76318752bba0f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:11:04 +0000 Subject: [PATCH 6/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 78c4063c6b76da9099b0d995bd88056b95e425da Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:03:31 +0000 Subject: [PATCH 7/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 205160017748ea9b584ba24ac89348945e743305 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:44:44 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild