From 39c4f45639992021c18e587f1c1b210383f135b0 Mon Sep 17 00:00:00 2001
From: Robin Lee <cheeselee@fedoraproject.org>
Date: Jun 21 2013 07:13:53 +0000
Subject: Patch fcitx4-config to use pkg-config to solve libdir


- Move fcitx4-config to devel package
- devel subpackage explicitly requires pkgconfig

---

diff --git a/fcitx.spec b/fcitx.spec
index 59b486d..d23078a 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -5,7 +5,7 @@
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
 Version:		4.2.7
-Release:		5%{?dist}
+Release:		6%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@@ -55,6 +55,7 @@ The %{name}-libs package provides shared libraries for FCITX
 Summary:		Development files for FCITX
 Group:			Development/Libraries
 Requires:		%{name}-libs = %{version}-%{release}
+Requires:		/usr/bin/pkg-config
 Requires:		libX11-devel
 
 %description devel
@@ -147,6 +148,11 @@ popd
 
 install -pm 644 -D %{SOURCE1} %{buildroot}%{_xinputconf}
 
+# patch fcitx4-config to use pkg-config to solve libdir to avoid multiarch
+# confilict
+sed -i -e 's:%{_libdir}:`pkg-config --variable=libdir fcitx`:g' \
+  ${RPM_BUILD_ROOT}%{_bindir}/fcitx4-config
+
 %find_lang %{name}
 
 desktop-file-install --delete-original \
@@ -205,7 +211,6 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_bindir}/readPYMB
 %{_bindir}/scel2org
 %{_bindir}/txt2mb
-%{_bindir}/fcitx4-config
 %{_datadir}/applications/%{name}-skin-installer.desktop
 %{_datadir}/%{name}/dbus/daemon.conf
 %{_datadir}/applications/%{name}-configtool.desktop
@@ -261,6 +266,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %files devel
 %defattr(-,root,root,-)
 %doc 
+%{_bindir}/fcitx4-config
 %{_libdir}/libfcitx*.so
 %{_libdir}/pkgconfig/fcitx*.pc
 %{_includedir}/fcitx*
@@ -318,6 +324,11 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
+* Fri Jun 21 2013 Robin Lee <cheeselee@fedoraproject.org> - 4.2.7-6
+- Move fcitx4-config to devel package and patch it to use pkg-config to solve
+  libdir
+- devel subpackage explicitly requires pkgconfig
+
 * Fri Jun 21 2013 Robin Lee <cheeselee@fedoraproject.org> - 4.2.7-5
 - Move fcitx4-config to base package to solve multiarch devel subpackage conflict