2.20.2673.102.20170321-2: Fix to work makepkg --nobuild && makepkg --noprepare

2 files changed, 17 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 422198eec270..bca7c6d19882 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# 水  3月 22 11:52:12 UTC 2017
+# 日  4月 16 11:46:07 UTC 2017
 pkgbase = mozc-ut2
 	pkgdesc = Mozc the Japanese Input Method with Mozc UT2 Dictionary (additional dictionary) and uim-mozc (optional)
 	pkgver = 2.20.2673.102.20170321
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.geocities.jp/ep3797/mozc-ut2.html
 	arch = i686
 	arch = x86_64
@@ -25,16 +25,16 @@ pkgbase = mozc-ut2
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/mozcdic-ut2-20170321.tar.bz2
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/edict2-20170321.gz
 	source = EDICT_license.html
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/ken_all-201702.zip
-	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201702.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/ken_all-201703.zip
+	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/jigyosyo-201703.zip
 	source = mod-generate-dictionary.sh
 	source = http://downloads.sourceforge.net/project/pnsft-aur/mozc/uim-mozc-321.3ea28b1.tar.xz
 	sha1sums = SKIP
 	sha1sums = 66b5ebb21625880d5a00e77d200111ba32455546
 	sha1sums = 4a44c97c3eb68d538279dcf44beaa576d911bf0e
 	sha1sums = e0ba18e67c1be8e3cfb8ecb30760597b215da255
-	sha1sums = 4a9eaeef43cca7e97a2923b344bcf361cb1d1f73
-	sha1sums = b530dd3f205526e875b4506bec312f22bc737c70
+	sha1sums = 170e0a08129b0c96fbac30ed2c1d00ca8c83d7c6
+	sha1sums = d2ba37f4bd5d20c85c7e732a4a1d50704d384319
 	sha1sums = 16574ba571784ff037022ecdab7f62c9d5bb4ce6
 	sha1sums = 22b7c2a5b0a7fef778ee72ebe5873a75e879d26b
 
@@ -47,7 +47,7 @@ pkgname = mozc-ut2
 	depends = qt5-base
 	depends = zinnia
 	optdepends = tegaki-models-zinnia-japanese: hand-writing recognition support
-	provides = mozc=
+	provides = mozc=2.20.2673.102
 	conflicts = mozc
 	conflicts = mozc-server
 	conflicts = mozc-utils-gui
@@ -61,7 +61,7 @@ pkgname = ibus-mozc-ut2
 	arch = i686
 	arch = x86_64
 	groups = mozc-im
-	depends = mozc=
+	depends = mozc=2.20.2673.102
 	depends = ibus>=1.4.1
 	provides = ibus-mozc
 	conflicts = ibus-mozc
@@ -74,7 +74,7 @@ pkgname = uim-mozc-ut2
 	arch = i686
 	arch = x86_64
 	groups = mozc-im
-	depends = mozc=
+	depends = mozc=2.20.2673.102
 	depends = uim
 	provides = uim-mozc
 	conflicts = uim-mozc
@@ -87,7 +87,7 @@ pkgname = emacs-mozc-ut2
 	arch = i686
 	arch = x86_64
 	groups = mozc-im
-	depends = mozc=
+	depends = mozc=2.20.2673.102
 	depends = emacs
 	provides = emacs-mozc
 	conflicts = emacs-mozc
diff --git a/PKGBUILD b/PKGBUILD
index ce5a39c094d1..ea1ce3514204 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -72,6 +72,7 @@ _bldtype=Release
 #_bldtype=Debug
 
 _mozcrev=280e38fe3d9db4df52f0713acf2ca65898cd697a
+_mozcver=2.20.2673.102
 _utdicver=20170321
 _zipcoderel=201703
 _uimmozcrev=321.3ea28b1
@@ -79,8 +80,8 @@ _uimmozcrev=321.3ea28b1
 pkgbase=mozc-ut2
 pkgname=mozc-ut2
 true && pkgname=('mozc-ut2')
-pkgver=2.20.2673.102.20170321
-pkgrel=1
+pkgver="${_mozcver}.${_utdicver}"
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://www.geocities.jp/ep3797/mozc-ut2.html"
 license=('BSD' 'GPL' 'CC-BY-SA' 'custom')
@@ -120,21 +121,8 @@ if [[ "$_emacs_mozc" == "yes" ]]; then
 fi
 
 
-mozcver() {
-  . "${srcdir}/mozc/src/data/version/mozc_version_template.bzl"
-  printf "%s.%s.%s.%s" $MAJOR $MINOR $BUILD $REVISION
-}
-
-
-pkgver() {
-  printf "%s.%s" $_mozcver "${_utdicver}"
-}
-
-
 prepare() {
-  cd "$srcdir"
-  ln -sf `which python2` ./python
-  PATH="${srcdir}:${PATH}"
+  ln -sf `which python2` "${srcdir}/python"
 
   cd "${srcdir}/mozc/"
 
@@ -142,14 +130,13 @@ prepare() {
 
   cd "${srcdir}/mozcdic-ut2-${_utdicver}"
 
-  _mozcver=`mozcver`
   "${srcdir}/mod-generate-dictionary.sh"
   msg "Generating UT dictionary seed..."
   MOZCVER="$_mozcver" DICVER="$_utdicver" NICODIC="$_NICODIC" \
     ./generate-dictionary.sh
   msg "Done."
 
-  cd "${srcdir}/${pkgbase}-`pkgver`/src"
+  cd "${srcdir}/${pkgbase}-${pkgver}/src"
 
   # uim-mozc
   if [[ "$_uim_mozc" == "yes" ]]; then
@@ -177,6 +164,8 @@ build() {
 
   msg "Starting make..."
 
+  PATH="${srcdir}:${PATH}"
+ 
   cd "${srcdir}/${pkgbase}-${pkgver}/src"
 
   _targets="server/server.gyp:mozc_server gui/gui.gyp:mozc_tool "