From 7f7ac75b4d9fd4c130fb8ba3a531baca31620a87 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Wed, 21 Nov 2012 19:51:51 +0900 Subject: [PATCH] Updated for a misc issue. --- ibus-anthy.spec | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/ibus-anthy.spec b/ibus-anthy.spec index 588eea9..34b2485 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -1,9 +1,9 @@ -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%define sub_version 1.0 -%define require_ibus_version 1.4.99.20120203 -%define have_default_layout 1 -%define have_bridge_hotkey 1 +%global sub_version 1.0 +%global require_ibus_version 1.4.99.20120203 +%global have_default_layout 1 +%global have_bridge_hotkey 1 Name: ibus-anthy Version: 1.4.99.20121006 @@ -21,16 +21,16 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz Patch91: ibus-anthy-xx-disable-prop-symbol.patch %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - BuildRequires: anthy-devel +BuildRequires: desktop-file-utils BuildRequires: gettext-devel BuildRequires: glib2-devel +BuildRequires: gobject-introspection-devel BuildRequires: ibus BuildRequires: intltool BuildRequires: libtool BuildRequires: pkgconfig -BuildRequires: gobject-introspection-devel +BuildRequires: python2-devel Requires: ibus >= %{require_ibus_version} Requires: anthy @@ -73,22 +73,24 @@ for developers. make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -make DESTDIR=${RPM_BUILD_ROOT} install +make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm -f $RPM_BUILD_ROOT%{_libdir}/libanthygobject-%{sub_version}.la %find_lang %{name} -%clean -rm -rf $RPM_BUILD_ROOT +%check +desktop-file-validate \ + $RPM_BUILD_ROOT%{_datadir}/applications/ibus-setup-anthy.desktop %post +/sbin/ldconfig # recreate icon cache touch --no-create %{_datadir}/icons/hicolor || : [ -x %{_bindir}/gtk-update-icon-cache ] && \ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %postun +/sbin/ldconfig # recreate icon cache touch --no-create %{_datadir}/icons/hicolor || : [ -x %{_bindir}/gtk-update-icon-cache ] && \