From 8672699f391656173d86488d4b8dcdd7c3770462 Mon Sep 17 00:00:00 2001 From: Takao Fujiwara Date: Wed, 12 Dec 2012 21:33:26 +0900 Subject: [PATCH] Resolved #884031. Deleted arch depended files. --- ibus-anthy-HEAD.patch | 24 ++++++++++++++++++++++++ ibus-anthy.spec | 25 +++++++++++++++++++++---- 2 files changed, 45 insertions(+), 4 deletions(-) diff --git a/ibus-anthy-HEAD.patch b/ibus-anthy-HEAD.patch index 8b13789..9f50cfa 100644 --- a/ibus-anthy-HEAD.patch +++ b/ibus-anthy-HEAD.patch @@ -1 +1,25 @@ +From 80853b7b8b1f7c7bfe9bfc125ad55491925f6c8c Mon Sep 17 00:00:00 2001 +From: fujiwarat +Date: Wed, 12 Dec 2012 21:02:33 +0900 +Subject: [PATCH] Fixed to delete arch depended lines. (#884031) + +--- + engine/ibus-engine-anthy.in | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/engine/ibus-engine-anthy.in b/engine/ibus-engine-anthy.in +index 3b1c5fe..1b3fd68 100644 +--- a/engine/ibus-engine-anthy.in ++++ b/engine/ibus-engine-anthy.in +@@ -26,8 +26,6 @@ prefix=@prefix@ + datarootdir=@datarootdir@ + exec_prefix=@exec_prefix@ + libexecdir=@libexecdir@ +-pyexecdir=@pyexecdir@ +-export PYTHONPATH=@pyexecdir@:$PYTHONPATH + export IBUS_PREFIX=@prefix@ + export IBUS_ANTHY_PKGDATADIR=@datarootdir@/@PACKAGE@ + export LIBEXECDIR=$libexecdir +-- +1.8.0 diff --git a/ibus-anthy.spec b/ibus-anthy.spec index 1168d98..ddfd1e1 100644 --- a/ibus-anthy.spec +++ b/ibus-anthy.spec @@ -5,18 +5,20 @@ Name: ibus-anthy Version: 1.4.99.20121006 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Anthy engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries URL: http://code.google.com/p/ibus/ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz -# Patch0: ibus-anthy-HEAD.patch +# Upstreamed patches. +# Patch0: %%{name}-HEAD.patch +Patch0: %{name}-HEAD.patch %if (0%{?fedora} <= 17 && 0%{?rhel} < 7) # IBusProperty.symbol is not used by ibus-gjs -Patch91: ibus-anthy-xx-disable-prop-symbol.patch +Patch91: %{name}-xx-disable-prop-symbol.patch %endif BuildRequires: anthy-devel @@ -52,7 +54,8 @@ for developers. %prep %setup -q -# patch0 -p1 +# %%patch0 -p1 +%patch0 -p1 %if (0%{?fedora} <= 17 && 0%{?rhel} < 7) %patch91 -p1 @@ -70,6 +73,17 @@ for developers. # make -C po update-gmo make %{?_smp_mflags} +# home [dot] corp [dot] redhat [dot] com/wiki/rpmdiff-multilib +if test -f engine/_config.py.in -a -f engine/_config.py ; then + touch -r engine/_config.py.in engine/_config.py +fi +if test -f setup/_config.py.in -a -f setup/_config.py ; then + touch -r setup/_config.py.in setup/_config.py +fi +if test -f setup/anthyprefs.py.in -a -f setup/anthyprefs.py ; then + touch -r setup/anthyprefs.py.in setup/anthyprefs.py +fi + %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p' rm -f $RPM_BUILD_ROOT%{_libdir}/libanthygobject-%{sub_version}.la @@ -112,6 +126,9 @@ touch --no-create %{_datadir}/icons/hicolor || : %{_libdir}/libanthygobject-%{sub_version}.so %changelog +* Wed Dec 12 2012 Takao Fujiwara - 1.4.99.20121006-3 +- Resolved #884031. Deleted arch depended files. + * Thu Nov 22 2012 Takao Fujiwara - 1.4.99.20121006-2 - Updated to save the spec update.