pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 836538 from home:qzhao:branches:M17N

Browse Source 
Update ibus.spec: Drop the is_opensuse macro to eliminate the difference between SLE-15 and openSUSE-Leap (jsc#SLE-12084).

OBS-URL: https://build.opensuse.org/request/show/836538
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=238
This commit is contained in:
Hillwood Yang 2020-09-28 04:06:38 +00:00 committed by Git OBS Bridge
parent 14a6d3d81d
commit e93aac6883
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ibus.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Sep 24 07:01:32 UTC 2020 - Cliff Zhao <qzhao@suse.com>
- Update ibus.spec: Drop the is_opensuse macro to eliminate the
difference between SLE-15 and openSUSE-Leap (jsc#SLE-12084).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 12 07:32:41 UTC 2020 - QK ZHU <qkzhu@suse.com> Tue May 12 07:32:41 UTC 2020 - QK ZHU <qkzhu@suse.com>

7
ibus.spec
View File

@ -109,11 +109,6 @@ BuildRequires: pkgconfig(wayland-client) >= 1.2.0
BuildRequires: unicode-emoji BuildRequires: unicode-emoji
BuildRequires: pkgconfig(cldr-emoji-annotation) BuildRequires: pkgconfig(cldr-emoji-annotation)
%endif %endif
# PATCH-FEATURE-SLE FATE#319095 qzhao@suse.com
# Add conflict with fcitx to keep old IMF for people who update from SLE-12 SP0 to SP1.
%if !0%{?is_opensuse}
Conflicts: fcitx
%endif
%description %description
IBus, short for Intelligent Input Bus, is an input framework. IBus IBus, short for Intelligent Input Bus, is an input framework. IBus
@ -201,11 +196,9 @@ sed -i 1i"SYS_LIB=%{_lib}" xim.d-ibus-121
cp -r %{SOURCE10} . cp -r %{SOURCE10} .
cp -r %{SOURCE11} . cp -r %{SOURCE11} .
%if !0%{?is_opensuse}
%patch10 -p1 %patch10 -p1
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
%endif
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1 %patch15 -p1