[fcitx] Build with %cmake macro and Fix the ownership

[Liang Suilong]

commit 47bd54a970dbc5948d03cbd3846be933d3982df0
Author: Fedora <fedora at fedora-desktop.(none)>
Date:   Fri Apr 27 00:33:54 2012 +0800

    Build with %cmake macro and Fix the ownership

 fcitx.spec |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 deletions(-)
---
diff --git a/fcitx.spec b/fcitx.spec
index bbb17e7..43ba863 100644
--- a/fcitx.spec
+++ b/fcitx.spec
@@ -5,7 +5,7 @@
 Name:			fcitx
 Summary:		Free Chinese Input Toy for X (XIM)
 Version:		4.2.2
-Release:		1%{?dist}
+Release:		2%{?dist}
 License:		GPLv2+
 Group:			User Interface/Desktops
 URL:			http://code.google.com/p/%{name}/
@@ -98,17 +98,17 @@ This package contains fcitx im module for qt4.
 %build
 mkdir -p build
 pushd build
-cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR=%{_libdir}
-make %{?_smp_mflags}
+%cmake .. -DENABLE_GTK3_IM_MODULE=On -DENABLE_QT_IM_MODULE=On -DENABLE_OPENCC=On
+make VERBOSE=1 %{?_smp_mflags}
 
 %install
 pushd build
-make install INSTALL="install -p" DESTDIR=%{buildroot}
+make install INSTALL="install -p" DESTDIR=$RPM_BUILD_ROOT
 rm -f %{buildroot}%{_libdir}/*.la
 popd
 
 # remove rpath
-chrpath --delete %{buildroot}%{_bindir}/{*PYMB,mb2org,fcitx,readPYBase}
+#chrpath --delete %{buildroot}%{_bindir}/{*PYMB,mb2org,fcitx,readPYBase}
 
 # fix doc path
 #mkdir __doc
@@ -192,13 +192,14 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_mandir}/man1/readPYMB.1.gz
 %{_mandir}/man1/scel2org.1.gz
 %{_mandir}/man1/txt2mb.1.gz
+%{_datadir}/%{name}/
 
 %files libs
 %defattr(-,root,root,-)
 %doc
 %{_bindir}/fcitx4-config
 %{_libdir}/libfcitx*.so.*
-%{_libdir}/%{name}/*.so
+%{_libdir}/%{name}/
 
 %files data
 %defattr(-,root,root,-)
@@ -215,14 +216,7 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 %{_datadir}/icons/hicolor/48x48/status/*.png
 %{_datadir}/icons/hicolor/scalable/status/*.svg
 %{_datadir}/icons/gnome/scalable/status/*.svg
-%{_datadir}/%{name}/data/
-%{_datadir}/%{name}/configdesc/
-%{_datadir}/%{name}/pinyin/
-%{_datadir}/%{name}/skin/
-%{_datadir}/%{name}/addon/
-%{_datadir}/%{name}/table/wbx.conf
-%{_datadir}/%{name}/table/wbx.mb
-%{_datadir}/%{name}/inputmethod/*.conf
+%{_datadir}/%{name}/inputmethod/
 
 %files devel
 %defattr(-,root,root,-)
@@ -264,6 +258,10 @@ update-desktop-database %{_datadir}/applications &>/dev/null || :
 
 
 %changelog
+* Fri Apr 26 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.2-2
+- Build with %cmake macro (rhbz 738016)
+- Fix the ownership of directories (rhbz 816513)
+
 * Sun Apr 22 2012 Liang Suilong <liangsuilong at gmail.com> - 4.2.2-1
 - Upgrade to fcitx-4.2.2