Compare commits
10 Commits
2581cc9aea
...
6ffd33f598
Author | SHA1 | Date | |
---|---|---|---|
|
6ffd33f598 | ||
|
030dabf3e0 | ||
|
e2c6648711 | ||
|
72688ca864 | ||
|
abd66d61c6 | ||
|
445495ee06 | ||
|
1d27fb286d | ||
|
4f823f9fb9 | ||
|
66f2ecaa96 | ||
|
d0945867f0 |
2
.gitignore
vendored
2
.gitignore
vendored
@ -58,3 +58,5 @@ ibus-1.3.6.tar.gz
|
|||||||
/ibus-1.5.21.tar.gz
|
/ibus-1.5.21.tar.gz
|
||||||
/ibus-1.5.22.tar.gz
|
/ibus-1.5.22.tar.gz
|
||||||
/ibus-1.5.23.tar.gz
|
/ibus-1.5.23.tar.gz
|
||||||
|
/ibus-1.5.24.tar.gz
|
||||||
|
/ibus-1.5.25.tar.gz
|
||||||
|
1
.ibus.metadata
Normal file
1
.ibus.metadata
Normal file
@ -0,0 +1 @@
|
|||||||
|
4058f9b11781f9d33927c2464da6ebcaa5c2a83a ibus-1.5.25.tar.gz
|
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
--- !Policy
|
||||||
|
product_versions:
|
||||||
|
- rhel-9
|
||||||
|
decision_context: osci_compose_gate
|
||||||
|
rules:
|
||||||
|
# this is the testcase identifier, which OSCI pipeline uses
|
||||||
|
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
1972
ibus-HEAD.patch
1972
ibus-HEAD.patch
File diff suppressed because it is too large
Load Diff
37
ibus-xx-desktop-testing-mutter.patch
Normal file
37
ibus-xx-desktop-testing-mutter.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From d63da885f8f4e3764b8b572347b70a0cefadc335 Mon Sep 17 00:00:00 2001
|
||||||
|
From: fujiwarat <takao.fujiwara1@gmail.com>
|
||||||
|
Date: Wed, 16 Jun 2021 20:55:20 +0900
|
||||||
|
Subject: [PATCH] src/tests: Change window manager to mutter for RHEL
|
||||||
|
|
||||||
|
---
|
||||||
|
src/tests/ibus-desktop-testing-runner.in | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
|
||||||
|
index 54b7e0d7..211e0da5 100755
|
||||||
|
--- a/src/tests/ibus-desktop-testing-runner.in
|
||||||
|
+++ b/src/tests/ibus-desktop-testing-runner.in
|
||||||
|
@@ -44,7 +44,7 @@ TEST_LOG="test-suite.log"
|
||||||
|
TEST_LOG_STDOUT=0
|
||||||
|
RESULT_LOG=""
|
||||||
|
HAVE_GRAPHICS=1
|
||||||
|
-DESKTOP_COMMAND="dbus-launch --exit-with-session gnome-session"
|
||||||
|
+DESKTOP_COMMAND="dbus-launch --exit-with-session mutter"
|
||||||
|
PID_XORG=0
|
||||||
|
PID_GNOME_SESSION=0
|
||||||
|
TESTING_RUNNER="default"
|
||||||
|
@@ -80,9 +80,9 @@ usage()
|
||||||
|
"-b, --builddir=BUILDDIR Set the BUILDDIR\n" \
|
||||||
|
"-s, --srcdir=SOURCEDIR Set the SOURCEDIR\n" \
|
||||||
|
"-c, --no-graphics Use Xvfb instead of Xorg\n" \
|
||||||
|
-"-d, --desktop=DESKTOP Run DESTKTOP. The default is gnome-session.\n" \
|
||||||
|
+"-d, --desktop=DESKTOP Run DESTKTOP. The default is mutter.\n" \
|
||||||
|
" Suffix '-with-dbus' can run DESKTOP with dbus session." \
|
||||||
|
-" E.g. --desktop=mutter-with-dbus" \
|
||||||
|
+" E.g. --desktop=gnome-session-with-dbus" \
|
||||||
|
"-t, --tests=\"TESTS...\" Run TESTS programs which is separated by space\n" \
|
||||||
|
"-r, --runner=RUNNER Run TESTS programs with a test RUNNER.\n" \
|
||||||
|
" RUNNDER = gnome or default.\n" \
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
60
ibus.spec
60
ibus.spec
@ -37,8 +37,8 @@
|
|||||||
%global dbus_python_version 0.83.0
|
%global dbus_python_version 0.83.0
|
||||||
|
|
||||||
Name: ibus
|
Name: ibus
|
||||||
Version: 1.5.23
|
Version: 1.5.25
|
||||||
Release: 4%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Intelligent Input Bus for Linux OS
|
Summary: Intelligent Input Bus for Linux OS
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://github.com/ibus/%name/wiki
|
URL: https://github.com/ibus/%name/wiki
|
||||||
@ -49,6 +49,10 @@ Source2: %{name}.conf.5
|
|||||||
Patch0: %{name}-HEAD.patch
|
Patch0: %{name}-HEAD.patch
|
||||||
# Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
|
# Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
|
||||||
Patch1: %{name}-1385349-segv-bus-proxy.patch
|
Patch1: %{name}-1385349-segv-bus-proxy.patch
|
||||||
|
%if 0%{?fedora:0}%{?rhel:1}
|
||||||
|
# Use mutter window manager in RHEL CI
|
||||||
|
Patch2: %{name}-xx-desktop-testing-mutter.patch
|
||||||
|
%endif
|
||||||
|
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
@ -244,6 +248,11 @@ The ibus-devel-docs package contains developer documentation for IBus
|
|||||||
%package desktop-testing
|
%package desktop-testing
|
||||||
Summary: Wrapper of InstalledTests Runner for IBus
|
Summary: Wrapper of InstalledTests Runner for IBus
|
||||||
Requires: %{name} = %{version}-%{release}
|
Requires: %{name} = %{version}-%{release}
|
||||||
|
%if 0%{?fedora:1}%{?rhel:0}
|
||||||
|
# Use no-overview mode in CI to get input focus
|
||||||
|
BuildRequires: gnome-shell-extension-no-overview
|
||||||
|
Requires: gnome-shell-extension-no-overview
|
||||||
|
%endif
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%description desktop-testing
|
%description desktop-testing
|
||||||
@ -267,6 +276,7 @@ the functionality of the installed %{name} package.
|
|||||||
# cp client/gtk2/ibusim.c client/gtk3/ibusim.c || :
|
# cp client/gtk2/ibusim.c client/gtk3/ibusim.c || :
|
||||||
# cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || :
|
# cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || :
|
||||||
cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || :
|
cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || :
|
||||||
|
cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || :
|
||||||
|
|
||||||
|
|
||||||
# prep test
|
# prep test
|
||||||
@ -309,7 +319,6 @@ autoreconf -f -i -v
|
|||||||
--enable-introspection \
|
--enable-introspection \
|
||||||
--enable-install-tests \
|
--enable-install-tests \
|
||||||
%{nil}
|
%{nil}
|
||||||
make -C ui/gtk3 maintainer-clean-generic
|
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
@ -342,6 +351,10 @@ echo "NoDisplay=true" >> $RPM_BUILD_ROOT%{_datadir}/applications/org.freedesktop
|
|||||||
%endif
|
%endif
|
||||||
#echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%%{_sysconfdir}/xdg/autostart/ibus.desktop
|
#echo "X-GNOME-Autostart-enabled=false" >> $RPM_BUILD_ROOT%%{_sysconfdir}/xdg/autostart/ibus.desktop
|
||||||
|
|
||||||
|
HAS_PREFIX=$(grep prefix $RPM_BUILD_ROOT%{_bindir}/ibus-setup | wc -l)
|
||||||
|
[ x"$HAS_PREFIX" == x1 ] && \
|
||||||
|
sed -i -e '/prefix/d' $RPM_BUILD_ROOT%{_bindir}/ibus-setup
|
||||||
|
|
||||||
desktop-file-install --delete-original \
|
desktop-file-install --delete-original \
|
||||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||||
$RPM_BUILD_ROOT%{_datadir}/applications/*
|
$RPM_BUILD_ROOT%{_datadir}/applications/*
|
||||||
@ -375,9 +388,16 @@ fi
|
|||||||
|
|
||||||
%posttrans
|
%posttrans
|
||||||
dconf update || :
|
dconf update || :
|
||||||
|
|
||||||
|
%transfiletriggerin -- %{_datadir}/ibus/component
|
||||||
[ -x %{_bindir}/ibus ] && \
|
[ -x %{_bindir}/ibus ] && \
|
||||||
%{_bindir}/ibus write-cache --system &>/dev/null || :
|
%{_bindir}/ibus write-cache --system &>/dev/null || :
|
||||||
|
|
||||||
|
%transfiletriggerpostun -- %{_datadir}/ibus/component
|
||||||
|
[ -x %{_bindir}/ibus ] && \
|
||||||
|
%{_bindir}/ibus write-cache --system &>/dev/null || :
|
||||||
|
|
||||||
|
|
||||||
%ldconfig_scriptlets libs
|
%ldconfig_scriptlets libs
|
||||||
|
|
||||||
%files -f %{name}10.lang
|
%files -f %{name}10.lang
|
||||||
@ -490,6 +510,40 @@ dconf update || :
|
|||||||
%{_datadir}/installed-tests/ibus
|
%{_datadir}/installed-tests/ibus
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 04 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.25-2
|
||||||
|
- Fix wrong cursor location in gtk3. Related: rhbz#2008359
|
||||||
|
|
||||||
|
* Fri Aug 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.25-1
|
||||||
|
- Bump to 1.5.25. Related: rhbz#1995528
|
||||||
|
|
||||||
|
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.24-8
|
||||||
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
|
* Tue Jun 22 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-7
|
||||||
|
- Use transfiletriggerin for ibus write-cache. Related: rhbz#1963071
|
||||||
|
- Add gating.yaml
|
||||||
|
|
||||||
|
* Wed May 26 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-6
|
||||||
|
- Fix minor covscan reviews. Related: rhbz#1963071
|
||||||
|
|
||||||
|
* Fri May 21 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-5
|
||||||
|
- Fix covscan reviews. Related: rhbz#1963071
|
||||||
|
|
||||||
|
- Implement ibus_im_context_set_surrounding_with_selection()
|
||||||
|
|
||||||
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.24-4
|
||||||
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
|
* Sat Mar 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-3
|
||||||
|
- Don't output FAIL if the actual failure is 0 for Fedora CI
|
||||||
|
|
||||||
|
* Sat Mar 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-2
|
||||||
|
- Change default session to mutter from gnome in desktop-testing
|
||||||
|
|
||||||
|
* Mon Feb 22 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.24-1
|
||||||
|
- Bump to 1.5.24
|
||||||
|
|
||||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.23-4
|
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.23-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
2
sources
2
sources
@ -1 +1 @@
|
|||||||
SHA512 (ibus-1.5.23.tar.gz) = 4ea66d0a7203d665fb5c90e59ddf294614feeafc4f06b10e35989671a9bf39d5977e9061b9be224cd5a9439ac2f697a4326ff221ae868f5ebed46cbb09e9a205
|
SHA512 (ibus-1.5.25.tar.gz) = 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6
|
||||||
|
@ -76,30 +76,35 @@
|
|||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
status="PASS: frame"
|
status="PASS: frame"
|
||||||
fi
|
fi
|
||||||
echo "${status} $TEST" >> {{ remote_artifacts }}/test.log
|
echo "${status}" >> {{ remote_artifacts }}/test.log
|
||||||
|
echo "#### {{ remote_artifacts }}/{{ installed_test_name }}.log"
|
||||||
|
if [ -f {{ remote_artifacts }}/{{ installed_test_name }}.log ] ; then
|
||||||
|
cat {{ remote_artifacts }}/{{ installed_test_name }}.log
|
||||||
|
fi
|
||||||
|
echo "#"
|
||||||
|
echo "#### {{ remote_artifacts }}/test.log"
|
||||||
|
if [ -f {{ remote_artifacts }}/test.log ] ; then
|
||||||
|
cat {{ remote_artifacts }}/test.log
|
||||||
|
fi
|
||||||
|
echo "#"
|
||||||
|
|
||||||
- name: Check the results
|
- name: Check the results
|
||||||
shell: |
|
shell: |
|
||||||
IS_RAWHIDE=`grep -i rawhide /etc/fedora-release`
|
IS_RAWHIDE=`grep -i rawhide /etc/fedora-release`
|
||||||
if [ x"$IS_RAWHIDE" != x ] ; then
|
if [ x"$IS_RAWHIDE" != x ] ; then
|
||||||
echo PASS
|
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
log="{{ remote_artifacts }}/test.log"
|
log="{{ remote_artifacts }}/test.log"
|
||||||
if [ ! -f $log ] ; then
|
if [ ! -f $log ] ; then
|
||||||
echo ERROR
|
echo ERROR
|
||||||
exit 1
|
|
||||||
else
|
else
|
||||||
FAIL=`grep "^FAIL: " $log | grep -v 'FAIL: 0$'`
|
FAIL=`grep "^FAIL: " $log | grep -v 'FAIL: 0$'`
|
||||||
if [ x"$FAIL" != x ] ; then
|
if [ x"$FAIL" != x ] ; then
|
||||||
echo ERROR
|
echo ERROR
|
||||||
exit 1
|
|
||||||
else
|
|
||||||
echo PASS
|
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
register: test_fails
|
register: test_fails
|
||||||
#failed_when: False
|
failed_when: False
|
||||||
|
|
||||||
- name: Set role result
|
- name: Set role result
|
||||||
set_fact:
|
set_fact:
|
||||||
|
Loading…
Reference in New Issue
Block a user