Generate simple.xml with denylist

- Tell Pango about the engine language in the candidate panel
- Add file list in registry file for Silverblue
This commit is contained in:
Takao Fujiwara 2020-08-21 13:03:13 +09:00
parent 0f1f5beb7d
commit 97d0736b81
4 changed files with 1500 additions and 12 deletions

1
.gitignore vendored
View File

@ -61,3 +61,4 @@ ibus-1.3.6.tar.gz
/ibus-1.5.20.tar.gz /ibus-1.5.20.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-simple-1.5.22.20200821.xml.gz

File diff suppressed because it is too large Load Diff

View File

@ -7,12 +7,6 @@
%global with_pkg_config %(pkg-config --version >/dev/null 2>&1 && echo -n "1" || echo -n "0") %global with_pkg_config %(pkg-config --version >/dev/null 2>&1 && echo -n "1" || echo -n "0")
%if (0%{?fedora} > 21 || 0%{?rhel} > 7)
%global with_kde5 1
%else
%global with_kde5 0
%endif
%global ibus_api_version 1.0 %global ibus_api_version 1.0
# for bytecompile in %%{_datadir}/ibus/setup # for bytecompile in %%{_datadir}/ibus/setup
@ -32,13 +26,14 @@
Name: ibus Name: ibus
Version: 1.5.22 Version: 1.5.22
Release: 11%{?dist} Release: 12%{?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
Source0: https://github.com/ibus/%name/releases/download/%{version}/%{name}-%{version}.tar.gz Source0: https://github.com/ibus/%name/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-xinput Source1: %{name}-xinput
Source2: %{name}.conf.5 Source2: %{name}.conf.5
Source3: %{name}-simple-1.5.22.20200821.xml.gz
# Patch0: %%{name}-HEAD.patch # Patch0: %%{name}-HEAD.patch
Patch0: %{name}-HEAD.patch Patch0: %{name}-HEAD.patch
# Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
@ -71,9 +66,7 @@ BuildRequires: vala
BuildRequires: iso-codes-devel BuildRequires: iso-codes-devel
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: wayland-devel BuildRequires: wayland-devel
%if %with_kde5
BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtbase-devel
%endif
BuildRequires: cldr-emoji-annotation BuildRequires: cldr-emoji-annotation
BuildRequires: unicode-emoji BuildRequires: unicode-emoji
BuildRequires: unicode-ucd BuildRequires: unicode-ucd
@ -254,6 +247,10 @@ the functionality of the installed %{name} package.
# cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || : # cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || :
# cp client/gtk2/ibusim.c client/gtk3/ibusim.c || : # cp client/gtk2/ibusim.c client/gtk3/ibusim.c || :
cp client/gtk2/ibusim.c client/gtk3/ibusim.c || : cp client/gtk2/ibusim.c client/gtk3/ibusim.c || :
cd engine
cp %{SOURCE3} simple.xml.gz
gunzip simple.xml.gz
cd ..
# prep test # prep test
@ -285,9 +282,6 @@ autoreconf -f -i -v
--enable-python-library \ --enable-python-library \
%endif %endif
--enable-wayland \ --enable-wayland \
%if ! %with_kde5
--disable-appindicator \
%endif
--enable-introspection \ --enable-introspection \
--enable-install-tests \ --enable-install-tests \
%{nil} %{nil}
@ -464,6 +458,11 @@ dconf update || :
%{_datadir}/installed-tests/ibus %{_datadir}/installed-tests/ibus
%changelog %changelog
* Fri Aug 21 2020 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.22-12
- Generate simple.xml with denylist
- Tell Pango about the engine language in the candidate panel
- Add file list in registry file for Silverblue
* Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 1.5.22-11 * Tue Jul 28 2020 Adam Jackson <ajax@redhat.com> - 1.5.22-11
- Require setxkbmap not xorg-x11-xkb-utils - Require setxkbmap not xorg-x11-xkb-utils

View File

@ -1 +1,2 @@
SHA512 (ibus-1.5.22.tar.gz) = 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d SHA512 (ibus-1.5.22.tar.gz) = 0abe89acc6da8cea484a6b9f807c08e94869072f374f9e8f4541a426636f818f1c3cb8b9237f97245771f9e4bf19184983d8ac924177dc4824ca6e8b5304425d
SHA512 (ibus-simple-1.5.22.20200821.xml.gz) = f7532078bd409da0742538745d5d03942dd738a9bea935f75c9c0d74ad9891ff62fe7982a7c64ab957079583a12316d593f7f05534fa78a5c741eb5fb19f9da7