fcitx-kkc 0.1.1-2

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9540 ec354946-7b23-47d6-9f5a-488ba84defc7

f/fcitx-kkc/fcitx-kkc-vl.spec

@@ -1,27 +1,16 @@
 %define ver 0.1.1
-%define rel 1
+%define rel 2
-
-%define from_git 0
-%if %{from_git}
-%define githash 51112956
-%endif
 
 Summary: Japanese Kana Kanji Engine for Fcitx
 Name: fcitx-kkc
 Version: %{ver}
-%if %{from_git}
-Release: %{rel}.git%{githash}%{_dist_release}
-%else
 Release: %{rel}%{_dist_release}
-%endif
 License: GPLv3
 Group: System Environment/Libraries
 URL: https://fcitx-im.org
-%if %{from_git}
-Source0: %{name}-%{githash}.tar.xz
-%else
 Source0: http://download.fcitx-im.org/fcitx-kkc/%{name}-%{version}.tar.xz
-%endif
+Source1: https://raw.githubusercontent.com/fcitx/fcitx-kkc/5a98b507abdd6888e3124bca1448ad4e4d25b0ef/po/ja.po
+Patch0: https://github.com/m-shibata/fcitx-kkc/commit/49c0045cd5d0262d73d6006db9f6074707247717.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildRequires: cmake
 BuildRequires: fcitx-devel >= 4.2.8
@@ -36,11 +25,9 @@ Packager:     iwaim
 Japanese Kana Kanji Engine for Fcitx.
 
 %prep
-%if %{from_git}
-%setup -q -n %{name}-%{githash}
-%else
 %setup -q
-%endif
+%patch0 -p1
+%__cp %{SOURCE1} po/ja.po
 
 %build
 %__mkdir build
@@ -89,6 +76,11 @@ fi
 %{_includedir}/fcitx/module/kkc/fcitx-kkc.h
 
 %changelog
+* Sat May  2 2015 IWAI, Masaharu <iwaim.sub@gmail.com> 0.1.1-2
+- update ja.po from upstream
+- add 'fix the check for the keymap conflict was inverted' patch (Patch0)
+- clean up spec file
+
 * Sun Jun 15 2014 IWAI, Masaharu <iwaim.sub@gmail.com> 0.1.1-1
 - update to 0.1.1