rpm/ibus
SHA256
1
0
Fork 0
forked from pool/ibus
Code Pull Requests Activity

Accepting request 838319 from home:gmbr3:Active

Browse Source 
- Move xim.d files to /usr/etc when available, which is
  currently Tumbleweed only (boo#1176431)

OBS-URL: https://build.opensuse.org/request/show/838319
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=239
This commit is contained in:
Fuminobu Takeyama 2020-09-28 15:08:12 +00:00 committed by Git OBS Bridge
parent e93aac6883
commit 7b23e65698
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ibus.changes
View File

@ -4,6 +4,12 @@ Thu Sep 24 07:01:32 UTC 2020 - Cliff Zhao <qzhao@suse.com>
- Update ibus.spec: Drop the is_opensuse macro to eliminate the - Update ibus.spec: Drop the is_opensuse macro to eliminate the
difference between SLE-15 and openSUSE-Leap (jsc#SLE-12084). difference between SLE-15 and openSUSE-Leap (jsc#SLE-12084).
-------------------------------------------------------------------
Sat Sep 19 17:35:46 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Move xim.d files to /usr/etc when available, which is
currently Tumbleweed only (boo#1176431)
------------------------------------------------------------------- -------------------------------------------------------------------
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>

15
ibus.spec
View File

@ -18,6 +18,11 @@
%define with_wayland 1 %define with_wayland 1
%define with_emoji 1 %define with_emoji 1
%if ! %{defined _distconfdir}
%define _distconfdir %{_sysconfdir}
%else
%define use_usretc 1
%endif
Name: ibus Name: ibus
Version: 1.5.22 Version: 1.5.22
@ -232,15 +237,15 @@ make %{?_smp_mflags}
%make_install %make_install
# autostart # autostart
mkdir -p %{buildroot}%{_sysconfdir}/X11/xim.d/ mkdir -p %{buildroot}%{_distconfdir}/X11/xim.d/
install -m 644 xim.d-ibus-121 %{buildroot}%{_sysconfdir}/X11/xim.d/ibus install -m 644 xim.d-ibus-121 %{buildroot}%{_distconfdir}/X11/xim.d/ibus
mkdir -p %{buildroot}%{_bindir} mkdir -p %{buildroot}%{_bindir}
install -c -m 0755 ibus-autostart %{buildroot}%{_bindir}/ibus-autostart install -c -m 0755 ibus-autostart %{buildroot}%{_bindir}/ibus-autostart
mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
install -c -m 0644 ibus-autostart.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop install -c -m 0644 ibus-autostart.desktop %{buildroot}%{_sysconfdir}/xdg/autostart/ibus-autostart.desktop
PRIORITY=40 PRIORITY=40
pushd %{buildroot}%{_sysconfdir}/X11/xim.d/ pushd %{buildroot}%{_distconfdir}/X11/xim.d/
for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \ for lang in am ar as bn el fa gu he hi hr ja ka kk kn ko lo ml my \
pa ru sk vi zh_TW zh_CN zh_HK zh_SG \ pa ru sk vi zh_TW zh_CN zh_HK zh_SG \
de fr it es nl cs pl da nn nb fi en sv de fr it es nl cs pl da nn nb fi en sv
@ -300,7 +305,11 @@ dconf update
%doc AUTHORS README README.SUSE xim.ibus.suse.template %doc AUTHORS README README.SUSE xim.ibus.suse.template
%license COPYING %license COPYING
%{_rpmmacrodir}/macros.ibus %{_rpmmacrodir}/macros.ibus
%if %{defined use_usretc}
%{_distconfdir}/X11/xim.d/*
%else
%config %{_sysconfdir}/X11/xim.d/* %config %{_sysconfdir}/X11/xim.d/*
%endif
%{_bindir}/ibus %{_bindir}/ibus
%{_bindir}/ibus-autostart %{_bindir}/ibus-autostart
%{_bindir}/ibus-daemon %{_bindir}/ibus-daemon