diff --git a/ibus-table.spec b/ibus-table.spec index 7871929..b111afa 100644 --- a/ibus-table.spec +++ b/ibus-table.spec @@ -1,6 +1,6 @@ Name: ibus-table Version: 1.2.0.20100111 -Release: 4%{?dist} +Release: 5%{?dist} Summary: The Table engine for IBus platform License: LGPLv2+ Group: System Environment/Libraries @@ -13,6 +13,8 @@ Patch1: ibus-table-1.2.0.20090904-2.equalsign.patch Requires: ibus > 1.2.0 BuildRequires: ibus-devel > 1.2.0 +Obsoletes: ibus-table-additional < 1.2.0.20100111-5 + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -35,18 +37,11 @@ Headers and other files needed to develop applications using the %{name} library %build %configure --disable-static \ --prefix=%{_prefix} \ - --enable-additional %__make %{?_smp_mflags} %install %__rm -rf $RPM_BUILD_ROOT %__make DESTDIR=${RPM_BUILD_ROOT} NO_INDEX=true install pkgconfigdir=%{_datadir}/pkgconfig -### temp keep additional tables until ibus-table-{code,latin} are ready in repo -#for file in tables/compose.db tables/latex.db icons/compose.svg icons/latex.svg -#do -# %__rm ${RPM_BUILD_ROOT}%{_datadir}/ibus-table/$file -#done -### %find_lang %{name} @@ -109,19 +104,15 @@ ibus-table-createdb -i -n %{_datadir}/ibus-table/tables/latex.db %{_datadir}/%{name}/engine/tabsqlitedb.pyo %{_bindir}/%{name}-createdb %{_libexecdir}/ibus-engine-table -### temp keep additional tables until ibus-table-{code,latin} are ready in repo -%{_datadir}/%{name}/tables/template.txt -%{_datadir}/%{name}/tables/compose.db -%{_datadir}/%{name}/tables/latex.db -%{_datadir}/%{name}/icons/compose.svg -%{_datadir}/%{name}/icons/latex.svg -### %files devel %defattr(-, root, root, -) %{_datadir}/pkgconfig/%{name}.pc %changelog +* Wed Mar 10 2010 Caius 'kaio' Chance - 1.2.0.20100111-5 +- Remove -additional for obsoletion by ibus-table-latin and ibus-table-code. + * Mon Feb 15 2010 Caius 'kaio' Chance - 1.2.0.20100111-4.fc13 - Fixed latex.svg location.