Check %{rhel} version in addition to %{fedora}.
This commit is contained in:
parent
0539517109
commit
8612a7d0b5
@ -1,25 +1,25 @@
|
||||
%if (0%{?fedora} > 14)
|
||||
%if (0%{?fedora} > 14 || 0%{?rhel} > 6)
|
||||
%global require_ibus_version 1.3.99.20110817
|
||||
%global require_eekboard_version 1.0.3
|
||||
%global require_eekboard_version 1.0.6
|
||||
%else
|
||||
%global require_ibus_version 1.3.0
|
||||
%global require_eekboard_version 0.0.6
|
||||
%endif
|
||||
%global have_bridge_hotkey 0
|
||||
|
||||
%if (0%{?fedora} > 14)
|
||||
%if (0%{?fedora} > 14 || 0%{?rhel} > 6)
|
||||
%global _with_gtk --with-gtk=3.0
|
||||
%else
|
||||
%global _with_gtk --with-gtk=2.0
|
||||
%endif
|
||||
|
||||
%if (0%{?fedora} > 16)
|
||||
%if (0%{?fedora} > 16 || 0%{?rhel} > 6)
|
||||
%global _enable_eekboard --enable-eekboard
|
||||
%endif
|
||||
|
||||
Name: ibus-m17n
|
||||
Version: 1.3.3
|
||||
Release: 11%{?dist}
|
||||
Release: 12%{?dist}
|
||||
Summary: The M17N engine for IBus platform
|
||||
License: GPLv2+
|
||||
Group: System Environment/Libraries
|
||||
@ -39,12 +39,11 @@ BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: m17n-lib-devel
|
||||
%if (0%{?fedora} > 14)
|
||||
%if (0%{?fedora} > 14 || 0%{?rhel} > 6)
|
||||
BuildRequires: gtk3-devel
|
||||
%else
|
||||
BuildRequires: gtk2-devel
|
||||
%endif
|
||||
BuildRequires: libxklavier-devel
|
||||
BuildRequires: ibus-devel >= %{require_ibus_version}
|
||||
BuildRequires: eekboard-devel >= %{require_eekboard_version}
|
||||
|
||||
@ -79,7 +78,6 @@ make DESTDIR=${RPM_BUILD_ROOT} install
|
||||
%find_lang %{name}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS COPYING README
|
||||
%{_datadir}/ibus-m17n
|
||||
%{_libexecdir}/ibus-engine-m17n
|
||||
@ -87,9 +85,14 @@ make DESTDIR=${RPM_BUILD_ROOT} install
|
||||
%{_datadir}/ibus/component/*
|
||||
|
||||
%changelog
|
||||
* Tue Apr 3 2012 Daiki Ueno <dueno@redhat.com> - 1.3.3-12
|
||||
- Check %%{rhel} version in addition to %%{fedora}
|
||||
- Remove unnecessary %%defattr(-,root,root,-) from %%files
|
||||
- Drop libxklavier-devel from BR
|
||||
|
||||
* Fri Mar 30 2012 Daiki Ueno <dueno@redhat.com> - 1.3.3-11
|
||||
- Revive m17n:zh:pinyin with a different label ("hanyu pinyin (m17n)")
|
||||
- Rebase ibus-m17n-virtkbd.patch.
|
||||
- Rebase ibus-m17n-virtkbd.patch
|
||||
|
||||
* Tue Mar 6 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.3-9
|
||||
- Rebuild for ibus 1.4.99.20120304
|
||||
|
Loading…
Reference in New Issue
Block a user