Skip to content

Commit 210a6f7

Browse files
authored
Merge pull request #42 from ray2501/master
Update ibus-array.spec.in for build system change
2 parents 969cf4b + 0546830 commit 210a6f7

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

ibus-array.spec.in

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,15 @@ URL: https://github.com/lexical/ibus-array
1111
Source0: https://github.com/lexical/ibus-array/archive/release-%{version}.tar.gz
1212

1313
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
14+
BuildRequires: meson
15+
BuildRequires: ibus-devel
1416
BuildRequires: gettext-devel
1517
BuildRequires: opencc-devel
18+
%if 0%{?suse_version} || 0%{?sle_version} || 0%{?mandriva_version}
19+
BuildRequires: sqlite3-devel
20+
%else
21+
BuildRequires: sqlite-devel >= 3.0
22+
%endif
1623

1724
Requires: ibus
1825

@@ -23,13 +30,11 @@ IBus Array 30 project.
2330
%setup -q
2431

2532
%build
26-
%configure --disable-static
27-
# make -C po update-gmo
28-
make %{?_smp_mflags}
33+
%meson
34+
%meson_build
2935

3036
%install
31-
rm -rf $RPM_BUILD_ROOT
32-
make DESTDIR=${RPM_BUILD_ROOT} install
37+
%meson_install
3338

3439
%find_lang %{name}
3540

@@ -41,10 +46,10 @@ rm -rf $RPM_BUILD_ROOT
4146
%doc AUTHORS COPYING README
4247
# %dir %{python_sitearch}/ibus
4348
# %{python_sitearch}/ibus/*
44-
%dir %{_datadir}/ibus-array
45-
%{_datadir}/ibus-tmpl
46-
%{_bindir}/ibus-engine-array
47-
%{_datadir}/ibus/engine/array.engine
49+
%{_datadir}/%{name}/
50+
%{_datadir}/ibus/component/array.xml
51+
%{_libexecdir}/ibus-engine-array
52+
%{_libexecdir}/ibus-setup-array
4853

4954
%changelog
5055
* Fri Jul 17 2020 Keng-Yu Lin <kengyu@debian.org> - 0.2.2

0 commit comments

Comments
 (0)