[scim-fcitx] rename conflicted files with fcitx

[Peng Wu]

commit 06518b57478119ed0dae4125cb81be4d27fe9e28
Author: Peng Wu <alexepico at gmail.com>
Date:   Mon Mar 19 13:55:18 2012 +0800

    rename conflicted files with fcitx

 scim-fcitx-3.1.1-gcc47.patch |   24 ++++++++++++++++++++++++
 scim-fcitx.spec              |   22 +++++++++++++---------
 2 files changed, 37 insertions(+), 9 deletions(-)
---
diff --git a/scim-fcitx-3.1.1-gcc47.patch b/scim-fcitx-3.1.1-gcc47.patch
new file mode 100644
index 0000000..2ca8995
--- /dev/null
+++ b/scim-fcitx-3.1.1-gcc47.patch
@@ -0,0 +1,24 @@
+Index: fcitx/src/tools.cpp
+===================================================================
+--- fcitx.orig/src/tools.cpp
++++ fcitx/src/tools.cpp
+@@ -14,6 +14,7 @@ using namespace scim;
+ #include <sys/stat.h>
+ #include <limits.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #include "version.h"
+ #include "PYFA.h"
+Index: fcitx/src/sp.cpp
+===================================================================
+--- fcitx.orig/src/sp.cpp
++++ fcitx/src/sp.cpp
+@@ -12,6 +12,7 @@ using namespace scim;
+ #include <limits.h>
+ #include <ctype.h>
+ #include <cstring>
++#include <unistd.h>
+ 
+ #include "main.h"
+ #include "sp.h"
diff --git a/scim-fcitx.spec b/scim-fcitx.spec
index 32b8c28..9e1a974 100644
--- a/scim-fcitx.spec
+++ b/scim-fcitx.spec
@@ -1,18 +1,18 @@
 Name:           scim-fcitx
 Version:        3.1.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.scim-im.org/projects/imengines/
 Source0:        http://dl.sourceforge.net/scim/%{name}.%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  scim-devel
 Requires:	scim
 
 Patch0:         scim-fcitx-3.1.1-gcc43.patch
+Patch1:         scim-fcitx-3.1.1-gcc47.patch
 
 %description
 scim-fcitx is a port of the fcitx Chinese input method for the SCIM input
@@ -29,7 +29,8 @@ This package contains input table tools from fcitx.
 
 %prep
 %setup -q -n fcitx
-%patch0 -p1 -b .1-gcc43
+%patch0 -p1 -b .gcc43
+%patch1 -p1 -b .gcc47
 
 
 %build
@@ -39,15 +40,15 @@ make
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 make DESTDIR=${RPM_BUILD_ROOT} install
 
-rm $RPM_BUILD_ROOT/%{_libdir}/scim-1.0/*/IMEngine/fcitx.la
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm ${RPM_BUILD_ROOT}/%{_libdir}/scim-1.0/*/IMEngine/fcitx.la
 
+pushd ${RPM_BUILD_ROOT}/%{_bindir}/
+  mv createPYMB createPYMB3
+  mv mb2txt mb2txt3
+  mv txt2mb txt2mb3
+popd
 
 %files
 %defattr(-, root, root, -)
@@ -63,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 19 2012  Peng Wu <pwu at redhat.com> - 3.1.1-14
+- Rename conflicted files with fcitx.
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.1.1-13
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild