Accepting request 782027 from home:hillwood:branches:M17N
- Fix libexecdir path, add ibus-sunpinyin.changes libexecdir should be in %{_libdir}/ibus/ for ibus. OBS-URL: https://build.opensuse.org/request/show/782027 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-sunpinyin?expand=0&rev=36
This commit is contained in:
parent
289921a121
commit
860ac209fa
12
ibus-sunpinyin-fix-libexecdir.patch
Normal file
12
ibus-sunpinyin-fix-libexecdir.patch
Normal file
@ -0,0 +1,12 @@
|
||||
diff -Nur sunpinyin-3.0.0-rc1/wrapper/ibus/SConstruct sunpinyin-3.0.0-rc1-new/wrapper/ibus/SConstruct
|
||||
--- sunpinyin-3.0.0-rc1/wrapper/ibus/SConstruct 2020-03-06 16:43:44.640899052 +0800
|
||||
+++ sunpinyin-3.0.0-rc1-new/wrapper/ibus/SConstruct 2020-03-06 16:44:44.536512831 +0800
|
||||
@@ -71,7 +71,7 @@
|
||||
|
||||
data_dir = env['DATADIR'] + '/ibus-sunpinyin'
|
||||
icons_dir = env['DATADIR'] + '/ibus-sunpinyin/icons'
|
||||
-bin_dir = env['LIBEXECDIR'] + '/ibus-sunpinyin'
|
||||
+bin_dir = env['LIBEXECDIR'] + '/'
|
||||
gettext_package = 'ibus-sunpinyin'
|
||||
|
||||
extra_cflags = ' -DIBUS_SUNPINYIN_LOCALEDIR=\'"%s"\'' % (env['DATADIR'] + '/locale')
|
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 6 08:20:31 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
|
||||
|
||||
- Fix libexecdir path, add ibus-sunpinyin.changes
|
||||
libexecdir should be in %{_libdir}/ibus/ for ibus.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 3 12:38:51 UTC 2020 - Hillwood Yang <hillwood@opensuse.org>
|
||||
|
||||
|
@ -28,6 +28,8 @@ Source: https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1/sunpin
|
||||
Patch0: ibus-sunpinyin-scons-on-py3.patch
|
||||
# PATCH-FIX-UPSTREAM ibus-sunpinyin-migrate-to-python3.patch hillwood@opensuse.org -- Use python3, python2 is EOF
|
||||
Patch1: ibus-sunpinyin-migrate-to-python3.patch
|
||||
# PATCH-FIX-UPSTREAM ibus-sunpinyin-fix-libexecdir.patch hillwood@opensuse.org -- libexecdir should be in %{_libdir}/ibus/
|
||||
Patch2: ibus-sunpinyin-fix-libexecdir.patch
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: intltool
|
||||
BuildRequires: scons >= 1.2.0
|
||||
@ -47,31 +49,33 @@ SunPinyin with IBus framework.
|
||||
%setup -q -n sunpinyin-3.0.0-rc1
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
sed -i "s/LIBEXECDIR'\].*ibus-sunpinyin.*/LIBEXECDIR'\]/" SConstruct
|
||||
|
||||
%build
|
||||
cd wrapper/ibus/
|
||||
scons --prefix=%{_prefix} \
|
||||
--libdir=%{_libdir} \
|
||||
--libexecdir=%{_libdir}
|
||||
--libexecdir=%{_libdir}/ibus
|
||||
|
||||
%install
|
||||
pushd wrapper/ibus/
|
||||
scons install --prefix=%{_prefix} \
|
||||
--libdir=%{_libdir} \
|
||||
--libexecdir=%{_libdir} \
|
||||
--libexecdir=%{_libdir}/ibus \
|
||||
--install-sandbox=%{buildroot}
|
||||
popd
|
||||
|
||||
chmod 755 %{buildroot}%{_datadir}/%{name}/setup/main.py
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%doc wrapper/ibus/README
|
||||
%license wrapper/ibus/COPYING wrapper/ibus/LGPL.LICENSE wrapper/ibus/OPENSOLARIS.LICENSE
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/ibus-engine-sunpinyin
|
||||
%{_libdir}/%{name}/ibus-setup-sunpinyin
|
||||
%{_libdir}/ibus/ibus-engine-sunpinyin
|
||||
%{_libdir}/ibus/ibus-setup-sunpinyin
|
||||
%{_datadir}/%{name}
|
||||
%{_datadir}/ibus/component/sunpinyin.xml
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user