[ibus-gucharmap] Update to 1.4.0-5.

Daiki Ueno ueno at fedoraproject.org
Thu Apr 12 04:48:27 UTC 2012


commit 914a9c99ba1ccea8673773504a5a3412f9d09a8e
Author: Daiki Ueno <ueno at unixuser.org>
Date:   Thu Apr 12 13:48:10 2012 +0900

    Update to 1.4.0-5.

 ibus-gucharmap-workaround-abi-break.patch |   16 ----------------
 ibus-gucharmap.spec                       |   12 +++++-------
 2 files changed, 5 insertions(+), 23 deletions(-)
---
diff --git a/ibus-gucharmap.spec b/ibus-gucharmap.spec
index 748b553..66bd4cd 100644
--- a/ibus-gucharmap.spec
+++ b/ibus-gucharmap.spec
@@ -2,14 +2,13 @@
 
 Name:		ibus-gucharmap
 Version:	1.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Unicode input engine (using Gucharmap) for IBus platform
 
 License:	GPLv2+
 Group:		System Environment/Libraries
 URL:		http://github.com/ueno/ibus-gucharmap/
 Source0:	https://github.com/downloads/ueno/ibus-gucharmap/%{name}-%{version}.tar.gz
-Patch0:		ibus-gucharmap-workaround-abi-break.patch
 
 BuildRequires:	vala
 BuildRequires:	gucharmap-devel
@@ -26,14 +25,10 @@ navigation.
 
 %prep
 %setup -q -n %{name}-%{version}
-%patch0 -p1 -b .workaround-abi-break
 # NOCONFIGURE=yes ./autogen.sh
 
 
 %build
-# FIXME: workaround for gucharmap 3.3.1-1
-GUCHARMAP_CFLAGS="`pkg-config gtk+-3.0 glib-2.0 --cflags` -I%{_includedir}/gucharmap-2.90"
-export GUCHARMAP_CFLAGS
 %configure
 make %{?_smp_mflags}
 
@@ -45,7 +40,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 
 
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc COPYING README
 %{_libexecdir}/ibus-engine-gucharmap
 %{_libexecdir}/ibus-setup-gucharmap
@@ -54,6 +48,10 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %{_datadir}/ibus-gucharmap/setup/ibus-gucharmap-preferences.ui
 
 %changelog
+* Thu Apr 12 2012 Daiki Ueno <dueno at redhat.com> - 1.4.0-5
+- remove workaround for new gucharmap (solved in gucharmap 3.4.0.1)
+- drop unnecessary %%defattr(-,root,root,-) from %%files
+
 * Thu Mar 15 2012 Daiki Ueno <dueno at redhat.com> - 1.4.0-4
 - rebuild with new ibus
 - workaround for new gucharmap


More information about the scm-commits mailing list