From bb35fe4ed7d0017775232291c6bc6836745dd78849c26ccc7211f716473a0c61 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Thu, 30 Nov 2017 03:14:32 +0000 Subject: [PATCH] Accepting request 546394 from home:badshah400:branches:M17N - Specfile cleanup: * Update source URLs; fedorahosted has been retired. * Fix package Group. * Run spec-cleaner for minor formatting clean-ups. OBS-URL: https://build.opensuse.org/request/show/546394 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus-typing-booster?expand=0&rev=18 --- ibus-typing-booster.changes | 8 ++++ ibus-typing-booster.spec | 76 ++++++++++++++++++------------------- 2 files changed, 46 insertions(+), 38 deletions(-) diff --git a/ibus-typing-booster.changes b/ibus-typing-booster.changes index 8eebcaf..e0b8506 100644 --- a/ibus-typing-booster.changes +++ b/ibus-typing-booster.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Nov 29 09:37:20 UTC 2017 - badshah400@gmail.com + +- Specfile cleanup: + * Update source URLs; fedorahosted has been retired. + * Fix package Group. + * Run spec-cleaner for minor formatting clean-ups. + ------------------------------------------------------------------- Thu Oct 05 15:30:59 UTC 2017 - maiku.fabian@gmail.com diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec index 47f04f3..63da58e 100644 --- a/ibus-typing-booster.spec +++ b/ibus-typing-booster.spec @@ -14,29 +14,23 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -%define __python3 /usr/bin/python3 -Name: ibus-typing-booster -Version: 1.5.34 -Release: 1%{?dist} -Summary: A completion input method -License: GPL-3.0+ -Group: System Environment/Libraries -URL: https://mike-fabian.github.io/ibus-typing-booster/ -Source0: https://fedorahosted.org/releases/i/b/ibus-typing-booster/%{name}-%{version}.tar.gz -Source1: https://fedorahosted.org/releases/i/n/inscript2/inscript2-20160423.tar.gz -Requires: ibus >= 1.5.3 -Requires: m17n-lib -Requires: python3 >= 3.3 -Requires: dbus-1-python3 -Requires: python3-pyenchant -Requires: python3-pyxdg -# Recommend reasonably good fonts which have most of the emoji: -Recommends: noto-coloremoji-fonts -Recommends: gdouros-symbola-fonts +Name: ibus-typing-booster +Version: 1.5.34 +Release: 0 +Summary: An input completion utility +License: GPL-3.0+ +Group: System/X11/Utilities +URL: https://mike-fabian.github.io/ibus-typing-booster/ +Source0: https://github.com/mike-fabian/ibus-typing-booster/releases/download/%{version}/%{name}-%{version}.tar.gz +Source1: https://releases.pagure.org/inscript2/inscript2-20160423.tar.gz BuildRequires: ibus-devel BuildRequires: python3 BuildRequires: python3-devel +BuildRequires: desktop-file-utils +BuildRequires: python3-gobject +BuildRequires: dbus-1-x11 +BuildRequires: fdupes +BuildRequires: update-desktop-files # for the unit tests BuildRequires: m17n-lib BuildRequires: m17n-db @@ -61,11 +55,17 @@ BuildRequires: myspell-es_ES BuildRequires: myspell-fr_FR BuildRequires: myspell-it_IT %endif -BuildRequires: desktop-file-utils -BuildRequires: python3-gobject -BuildRequires: dbus-1-x11 -BuildRequires: fdupes -BuildRequires: update-desktop-files +# +Requires: ibus >= 1.5.3 +Requires: m17n-lib +Requires: python3 >= 3.3 +Requires: dbus-1-python3 +Requires: python3-pyenchant +Requires: python3-pyxdg +# Recommend reasonably good fonts which have most of the emoji: +Recommends: noto-coloremoji-fonts +Recommends: gdouros-symbola-fonts +# %description Ibus-typing-booster is a context sensitive completion @@ -77,21 +77,21 @@ input method to speedup typing. tar xzf %{SOURCE1} %build -export PYTHON=%{__python3} -%configure --disable-static --disable-additional --libexecdir=%{_prefix}/%{_lib}/ibus +export PYTHON=%{_bindir}/python3 +%configure --disable-static --disable-additional --libexecdir=%{_libdir}/ibus make %{?_smp_mflags} -%install -export PYTHON=%{__python3} -make install DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true INSTALL="install -p" pkgconfigdir=%{_datadir}/pkgconfig -gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/*.{txt,json} -gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotations/*.xml -gzip --force --best $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotationsDerived/*.xml +%install +export PYTHON=%{_bindir}/python3 +make install DESTDIR=%{buildroot} NO_INDEX=true +gzip --force --best %{buildroot}/%{_datadir}/%{name}/data/*.{txt,json} +gzip --force --best %{buildroot}/%{_datadir}/%{name}/data/annotations/*.xml +gzip --force --best %{buildroot}/%{_datadir}/%{name}/data/annotationsDerived/*.xml #install inscript2 keymaps -mkdir -p $RPM_BUILD_ROOT%{_datadir}/m17n/icons -cp -p inscript2/IM/* $RPM_BUILD_ROOT%{_datadir}/m17n/ -cp -p inscript2/icons/* $RPM_BUILD_ROOT%{_datadir}/m17n/icons +test -d %{buildroot}%{_datadir}/m17n/icons || mkdir -p %{buildroot}%{_datadir}/m17n/icons +cp -p inscript2/IM/* %{buildroot}%{_datadir}/m17n/ +cp -p inscript2/icons/* %{buildroot}%{_datadir}/m17n/icons %suse_update_desktop_file -i -u emoji-picker GTK Utility @@ -101,9 +101,9 @@ cp -p inscript2/icons/* $RPM_BUILD_ROOT%{_datadir}/m17n/icons %check export LC_ALL=en_US.UTF-8 -export M17NDIR=$RPM_BUILD_ROOT%{_datadir}/m17n/ +export M17NDIR=%{buildroot}%{_datadir}/m17n/ desktop-file-validate \ - $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-typing-booster.desktop + %{buildroot}%{_datadir}/applications/ibus-setup-typing-booster.desktop pushd engine # run doctests python3 hunspell_suggest.py