diff --git a/.gitignore b/.gitignore index f8ee366..eb7033a 100644 --- a/.gitignore +++ b/.gitignore @@ -34,11 +34,3 @@ ibus-m17n-1.3.0.tar.gz /ibus-m17n-1.4.27.tar.gz /ibus-m17n-1.4.28.tar.gz /ibus-m17n-1.4.29.tar.gz -/ibus-m17n-1.4.30.tar.gz -/ibus-m17n-1.4.31.tar.gz -/ibus-m17n-1.4.32.tar.gz -/ibus-m17n-1.4.33.tar.gz -/ibus-m17n-1.4.34.tar.gz -/ibus-m17n-1.4.35.tar.gz -/ibus-m17n-1.4.36.tar.gz -/ibus-m17n-1.4.37.tar.gz diff --git a/changelog b/changelog index 50cbc25..6ae18ce 100644 --- a/changelog +++ b/changelog @@ -1,9 +1,3 @@ -* Wed Jan 24 2024 Fedora Release Engineering - 1.4.27-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.4.27-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - * Sat Dec 02 2023 Mike FABIAN - 1.4.27-1 - Update to 1.4.27 - Prefer commit to "return FALSE;" for space, and other keys diff --git a/ibus-m17n.spec b/ibus-m17n.spec index 01f7545..b1e7876 100644 --- a/ibus-m17n.spec +++ b/ibus-m17n.spec @@ -1,7 +1,7 @@ %global require_ibus_version 1.4.0 Name: ibus-m17n -Version: 1.4.37 +Version: 1.4.29 Release: %autorelease Summary: The M17N engine for IBus platform License: GPL-2.0-or-later @@ -11,7 +11,7 @@ Source0: https://github.com/ibus/%{name}/archive/%{version}/%{name}-%{version BuildRequires: gettext-devel >= 0.19 BuildRequires: libtool BuildRequires: m17n-lib-devel -BuildRequires: gtk4-devel +BuildRequires: gtk3-devel BuildRequires: ibus-devel >= %{require_ibus_version} BuildRequires: desktop-file-utils BuildRequires: libappstream-glib @@ -28,7 +28,7 @@ the input table maps from m17n-db. %setup -q %build -%configure --disable-static --with-gtk=4.0 +%configure --disable-static --with-gtk=3.0 # make -C po update-gmo %{make_build} @@ -38,14 +38,14 @@ the input table maps from m17n-db. %find_lang %{name} %check -appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.metainfo.xml +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdata.xml desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-m17n.desktop make check %files -f %{name}.lang %doc AUTHORS README %license COPYING -%{_datadir}/metainfo/org.freedesktop.ibus.engine.m17n.metainfo.xml +%{_datadir}/metainfo/m17n.appdata.xml %{_datadir}/ibus-m17n %{_datadir}/icons/hicolor/16x16/apps/ibus-m17n.png %{_datadir}/icons/hicolor/22x22/apps/ibus-m17n.png diff --git a/sources b/sources index c57da11..3b7134f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ibus-m17n-1.4.37.tar.gz) = fde658bf6be122345da3ea7efbf331dec47092a241ffd39a4d8c9dab514ebb7d1e48a8c391788752133f5b56fcf20f5e9424859cb926662929289cc3a46b7479 +SHA512 (ibus-m17n-1.4.29.tar.gz) = bb3b3f44fa5a79e7e15c71b30760f7b29454a47b167f12cc4bde52ee03151f794795fd0d9bb6a2a7877a0afc909f81342d50461da3d49a905255c76288023edb diff --git a/tests/smoke/runtest.sh b/tests/smoke/runtest.sh index 90eda8f..ddf7ba6 100755 --- a/tests/smoke/runtest.sh +++ b/tests/smoke/runtest.sh @@ -3,33 +3,23 @@ rlJournalStart rlPhaseStartSetup - rlShowPackageVersion ibus-m17n - rlRun -t -l "VERSION=$(rpm -q ibus-m17n --queryformat='%{version}')" 0 "Get VERSION" - FEDORA_VERSION=$(rlGetDistroRelease) - rlLog "FEDORA_VERSION=${DISTRO_RELEASE}" rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory" rlRun "pushd $tmp" rlFetchSrcForInstalled "ibus-m17n" rlRun "rpm --define '_topdir $tmp' -i *src.rpm" - rlRun -t -l "mkdir BUILD" 0 "Creating BUILD directory" - rlRun -t -l "rpmbuild --noclean --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" - if [ -d BUILD/ibus-m17n-${VERSION}-build ]; then - rlRun -t -l "pushd BUILD/ibus-m17n-${VERSION}-build/ibus-m17n-${VERSION}" - else - rlRun -t -l "pushd BUILD/ibus-m17n-${VERSION}" - fi + rlRun "mkdir BUILD" 0 "Creating BUILD directory" + rlRun "rpmbuild --nodeps --define '_topdir $tmp' -bp $tmp/SPECS/*spec" + rlRun "pushd BUILD/ibus-m17n*" rlRun "set -o pipefail" - rlRun -t -l "NOCONFIGURE=1 ./autogen.sh" - rlRun -t -l "./configure --disable-static --with-gtk=3.0" - rlRun -t -l "make check" + rlRun "NOCONFIGURE=1 ./autogen.sh" + rlRun "./configure --disable-static --with-gtk=3.0" + rlRun "make check" rlAssertRpm "ibus" rlAssertRpm "m17n-db" rlPhaseEnd rlPhaseStartTest - # The -s option and & is important, when using the -d option - # in this test environment the error “Can't connect to IBus.” occurs. - rlRun -t -l "ibus-daemon -v -r -s &" + rlRun "ibus-daemon -v -r -d" rlRun "sleep 5" 0 "Give ibus-daemon some time to start properly." for name in \ am:sera \ @@ -121,7 +111,7 @@ rlJournalStart or:phonetic \ pa:anmollipi \ pa:inscript \ - pa:inscript2-guru \ + pa:inscript2 \ pa:itrans \ pa:jhelum \ pa:phonetic \ @@ -183,9 +173,9 @@ rlJournalStart vi:vni \ yi:yivo do - rlRun -t -l "/usr/libexec/ibus-engine-m17n --xml 2>/dev/null | grep 'm17n:${name}'" \ + rlRun "/usr/libexec/ibus-engine-m17n --xml 2>/dev/null | grep 'm17n:${name}'" \ 0 "checking whether 'ibus-engine-m17n --xml' can list m17n:${name}:" - rlRun -t -l "ibus list-engine --name-only | grep 'm17n:${name}$'" \ + rlRun "ibus list-engine --name-only | grep 'm17n:${name}$'" \ 0 "checking whether ibus can list m17n:${name}:" done rlPhaseEnd