Update to 0.12_a13

3 files changed, 54 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3141ba59b06d..cb54a508c146 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -29,3 +29,36 @@ pkgbase = parsoid
 
 pkgname = parsoid
 
+pkgbase = parsoid
+	pkgdesc = A bidirectional wikitext parser and runtime
+	pkgver = 0.12.0_a13
+	pkgrel = 2
+	url = https://www.mediawiki.org/wiki/Parsoid
+	install = parsoid.install
+	arch = any
+	license = GPL2
+	makedepends = git
+	makedepends = python2
+	depends = nodejs
+	depends = npm
+	optdepends = mediawiki: MediaWiki engine
+	provides = parsoid
+	conflicts = parsoid-git
+	options = !strip
+	backup = usr/share/webapps/parsoid/localsettings.js
+	backup = usr/share/webapps/parsoid/config.yaml
+	backup = etc/webapps/parsoid/config.yaml
+	backup = etc/webapps/parsoid/localsettings.js
+	source = https://github.com/wikimedia/parsoid/archive/v0.12.0-a13.zip
+	source = parsoid.service
+	source = parsoid.install
+	source = parsoid.sysusers
+	source = parsoid.tmpfiles
+	sha512sums = 155cd6c213c1587601ab0185b64ff565e34075eb7ed09bc0407bf4e39d9d9c14765724a226920f2109276f1f099fa8ca1c2130cc6b03035e0bd642bb8f4e5bee
+	sha512sums = 3733d08751209fdef134940bbcce48efd0f380e13a8df466a7a1010450857a924aa364628242e4307cf40f4a34e60c1aeb1400d9a5b9fed88b448ed549e4d3f1
+	sha512sums = 176c83b9bce00f63c0783f795ab5cb22746ccaab2ac49b13d71d974255b4eddadbbd481979c10bd5318194498cd3f2ce07af85ebf92508baa91ea4d4c7ee00c5
+	sha512sums = 7f2346af222052e2e685d859e0bb7a7c7c9f03988f772856e0888cad299cb3870afdc280feb9e2798e7989d3382f68f689d43a685b466ce9f138edb77b20de3a
+	sha512sums = 6158afa3c276ddb5090166680621b7b9213f3d73b2d1a95181f5441631be039e7d454228d2f214f1411bb7f953475ddbd368e89eaa2288ac200ac666a57a6a99
+
+pkgname = parsoid
+
diff --git a/PKGBUILD b/PKGBUILD
index e13d3303d185..362d584769e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,9 @@
 # Maintainer: Horo <horo@yoitsu.moe>
 
 pkgname=parsoid
-pkgver=0.10.0
-pkgrel=1
+_pkgname=parsoid
+pkgver=0.12.0_a13
+pkgrel=2
 pkgdesc="A bidirectional wikitext parser and runtime"
 arch=('any')
 url="https://www.mediawiki.org/wiki/Parsoid"
@@ -16,8 +17,10 @@ optdepends=(
 conflicts=('parsoid-git')
 provides=('parsoid')
 backup=(usr/share/webapps/parsoid/localsettings.js
-	usr/share/webapps/parsoid/config.yaml)
-source=("https://github.com/wikimedia/parsoid/archive/v${pkgver}.zip"
+	usr/share/webapps/parsoid/config.yaml
+	etc/webapps/parsoid/config.yaml
+        etc/webapps/parsoid/localsettings.js)
+source=("https://github.com/wikimedia/parsoid/archive/v${pkgver//_/-}.zip"
         "parsoid.service"
         "parsoid.install"
         "parsoid.sysusers"
@@ -26,7 +29,7 @@ source=("https://github.com/wikimedia/parsoid/archive/v${pkgver}.zip"
 options=('!strip')
 install="parsoid.install"
 prepare() {
-    cp -R $srcdir/parsoid-${pkgver} $srcdir/parsoid
+    cp -R $srcdir/parsoid-${pkgver//_/-} $srcdir/parsoid
 }
 build() { 
     cd $srcdir/parsoid
@@ -34,19 +37,25 @@ build() {
     npm install
 }
 package() {
-    mkdir -p "${pkgdir}/usr/share/webapps/${pkgname}"
     cd $srcdir/parsoid
-    cp localsettings.example.js localsettings.js    
-    cp config.example.yaml config.yaml
-    cp -R . "${pkgdir}/usr/share/webapps/${pkgname}/"
+    mkdir -p "${pkgdir}/usr/share/webapps/${_pkgname}"
+    cp -R . "${pkgdir}/usr/share/webapps/${_pkgname}/"
+
+    install -d  "$pkgdir"/etc/webapps/${_pkgname}
+    cp "$srcdir/parsoid/localsettings.example.js" "$pkgdir"/etc/webapps/${_pkgname}/localsettings.js
+    cp "$srcdir/parsoid/config.example.yaml" "$pkgdir"/etc/webapps/${_pkgname}/config.yaml
+    
+    ln -s /etc/webapps/${_pkgname}/config.yaml "$pkgdir"/usr/share/webapps/${_pkgname}/config.yaml
+    ln -s /etc/webapps/${_pkgname}/localsettings.js "$pkgdir"/usr/share/webapps/${_pkgname}/localsettings.js
+    
     install -Dm644 "${srcdir}/parsoid.service" "${pkgdir}/usr/lib/systemd/system/parsoid.service"
     install -Dm644 "$srcdir"/parsoid.sysusers "$pkgdir"/usr/lib/sysusers.d/parsoid.conf
     install -Dm644 "$srcdir"/parsoid.tmpfiles "$pkgdir"/usr/lib/tmpfiles.d/parsoid.conf
     install -D "COPYING.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
-sha512sums=('e7a67fb79a170ac22eea80b3a8fd9bc2a6e34fb88fdb9f5d8ce1c3535ecba84bc3061c53afa6085bf96d1971bbeb76ccc90fa5f7bed2f298b2b8108c2752d79e'
+sha512sums=('155cd6c213c1587601ab0185b64ff565e34075eb7ed09bc0407bf4e39d9d9c14765724a226920f2109276f1f099fa8ca1c2130cc6b03035e0bd642bb8f4e5bee'
             '3733d08751209fdef134940bbcce48efd0f380e13a8df466a7a1010450857a924aa364628242e4307cf40f4a34e60c1aeb1400d9a5b9fed88b448ed549e4d3f1'
-            '70473c30f7d78f40da1ab91c717e012575687e5edde18011d7a8759fc7ad0ad28a20514794a836d855b409a9becb4c779365d72dc3d5dcd62275d05f558876e8'
+            '176c83b9bce00f63c0783f795ab5cb22746ccaab2ac49b13d71d974255b4eddadbbd481979c10bd5318194498cd3f2ce07af85ebf92508baa91ea4d4c7ee00c5'
             '7f2346af222052e2e685d859e0bb7a7c7c9f03988f772856e0888cad299cb3870afdc280feb9e2798e7989d3382f68f689d43a685b466ce9f138edb77b20de3a'
             '6158afa3c276ddb5090166680621b7b9213f3d73b2d1a95181f5441631be039e7d454228d2f214f1411bb7f953475ddbd368e89eaa2288ac200ac666a57a6a99')
diff --git a/parsoid.install b/parsoid.install
index ff54b24f2042..5ec3e77ccea1 100644
--- a/parsoid.install
+++ b/parsoid.install
@@ -20,7 +20,7 @@ _update() {
 
 post_install() {
     _update
-    echo ">> Before run Parsoid, modify /usr/share/webapps/parsoid/config.yaml ."
+    echo ">> Before run Parsoid, modify /etc/webapps/parsoid/config.yaml ."
     echo ">> Reference comments in this file for help ."
 }