rpms/ibus-m17n
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Check %{rhel} version in addition to %{fedora}.

Browse Source
This commit is contained in:
Daiki Ueno 2012-04-03 12:17:39 +09:00
parent 0539517109
commit 8612a7d0b5
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ibus-m17n.spec
View File

@ -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_ibus_version 1.3.99.20110817
%global require_eekboard_version 1.0.3 %global require_eekboard_version 1.0.6
%else %else
%global require_ibus_version 1.3.0 %global require_ibus_version 1.3.0
%global require_eekboard_version 0.0.6 %global require_eekboard_version 0.0.6
%endif %endif
%global have_bridge_hotkey 0 %global have_bridge_hotkey 0
%if (0%{?fedora} > 14) %if (0%{?fedora} > 14 || 0%{?rhel} > 6)
%global _with_gtk --with-gtk=3.0 %global _with_gtk --with-gtk=3.0
%else %else
%global _with_gtk --with-gtk=2.0 %global _with_gtk --with-gtk=2.0
%endif %endif
%if (0%{?fedora} > 16) %if (0%{?fedora} > 16 || 0%{?rhel} > 6)
%global _enable_eekboard --enable-eekboard %global _enable_eekboard --enable-eekboard
%endif %endif
Name: ibus-m17n Name: ibus-m17n
Version: 1.3.3 Version: 1.3.3
Release: 11%{?dist} Release: 12%{?dist}
Summary: The M17N engine for IBus platform Summary: The M17N engine for IBus platform
License: GPLv2+ License: GPLv2+
Group: System Environment/Libraries Group: System Environment/Libraries
@ -39,12 +39,11 @@ BuildRequires: libtool
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: m17n-lib-devel BuildRequires: m17n-lib-devel
%if (0%{?fedora} > 14) %if (0%{?fedora} > 14 || 0%{?rhel} > 6)
BuildRequires: gtk3-devel BuildRequires: gtk3-devel
%else %else
BuildRequires: gtk2-devel BuildRequires: gtk2-devel
%endif %endif
BuildRequires: libxklavier-devel
BuildRequires: ibus-devel >= %{require_ibus_version} BuildRequires: ibus-devel >= %{require_ibus_version}
BuildRequires: eekboard-devel >= %{require_eekboard_version} BuildRequires: eekboard-devel >= %{require_eekboard_version}
@ -79,7 +78,6 @@ make DESTDIR=${RPM_BUILD_ROOT} install
%find_lang %{name} %find_lang %{name}
%files -f %{name}.lang %files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README %doc AUTHORS COPYING README
%{_datadir}/ibus-m17n %{_datadir}/ibus-m17n
%{_libexecdir}/ibus-engine-m17n %{_libexecdir}/ibus-engine-m17n
@ -87,9 +85,14 @@ make DESTDIR=${RPM_BUILD_ROOT} install
%{_datadir}/ibus/component/* %{_datadir}/ibus/component/*
%changelog %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 * Fri Mar 30 2012 Daiki Ueno <dueno@redhat.com> - 1.3.3-11
- Revive m17n:zh:pinyin with a different label ("hanyu pinyin (m17n)") - 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 * Tue Mar 6 2012 Takao Fujiwara <tfujiwar@redhat.com> - 1.3.3-9
- Rebuild for ibus 1.4.99.20120304 - Rebuild for ibus 1.4.99.20120304