Update conditionals

This commit is contained in:
Troy Dawson 2018-01-02 11:50:29 -08:00
parent 81eb6a2deb
commit 34fda8ed46

View File

@ -1,6 +1,6 @@
Name: ibus-typing-booster Name: ibus-typing-booster
Version: 1.5.34 Version: 1.5.34
Release: 1%{?dist} Release: 2%{?dist}
Summary: A completion input method Summary: A completion input method
License: GPLv3+ License: GPLv3+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -12,7 +12,7 @@ Requires: python3 >= 3.3
Requires: python3-dbus Requires: python3-dbus
Requires: python3-enchant Requires: python3-enchant
Requires: python3-pyxdg Requires: python3-pyxdg
%if 0%{?fedora} >= 24 %if 0%{?fedora} >= 24 || 0%{?rhel} > 7
# Recommend reasonably good fonts which have most of the emoji: # Recommend reasonably good fonts which have most of the emoji:
%if 0%{?fedora} <= 26 %if 0%{?fedora} <= 26
Recommends: google-noto-emoji-fonts Recommends: google-noto-emoji-fonts
@ -20,14 +20,14 @@ Recommends: google-noto-emoji-fonts
Recommends: google-noto-emoji-color-fonts Recommends: google-noto-emoji-color-fonts
Recommends: gdouros-symbola-fonts Recommends: gdouros-symbola-fonts
%endif %endif
%if 0%{?fedora} >= 26 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
# Save some space in the binary rpm by requiring the Fedora # Save some space in the binary rpm by requiring the Fedora
# packages which contain the emoji data files: # packages which contain the emoji data files:
Requires: cldr-emoji-annotation Requires: cldr-emoji-annotation
Requires: unicode-ucd Requires: unicode-ucd
%endif %endif
BuildRequires: ibus-devel BuildRequires: ibus-devel
%if 0%{?fedora} >= 24 %if 0%{?fedora} >= 24 || 0%{?rhel} > 7
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3-pyxdg BuildRequires: python3-pyxdg
%else %else
@ -71,7 +71,7 @@ make %{?_smp_mflags}
%install %install
export PYTHON=%{__python3} export PYTHON=%{__python3}
make install DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true INSTALL="install -p" pkgconfigdir=%{_datadir}/pkgconfig make install DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true INSTALL="install -p" pkgconfigdir=%{_datadir}/pkgconfig
%if 0%{?fedora} >= 26 %if 0%{?fedora} >= 26 || 0%{?rhel} > 7
# These files are in the required package “cldr-emoji-annotation” # These files are in the required package “cldr-emoji-annotation”
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotations/*.xml rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotations/*.xml
rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotationsDerived/*.xml rm $RPM_BUILD_ROOT/%{_datadir}/%{name}/data/annotationsDerived/*.xml
@ -147,6 +147,9 @@ make check || cat ./tests/test-suite.log
%changelog %changelog
* Tue Jan 02 2018 Troy Dawson <tdawson@redhat.com> - 1.5.34-2
- Update conditionals
* Thu Oct 05 2017 Mike FABIAN <mfabian@redhat.com> - 1.5.34-1 * Thu Oct 05 2017 Mike FABIAN <mfabian@redhat.com> - 1.5.34-1
- update to 1.5.34 - update to 1.5.34
- Update translations from zanata (cs new, de updated) - Update translations from zanata (cs new, de updated)