Update to 6.5.1, Add additional formats plugin

2 files changed, 42 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c40bad12e732..a6c4986dbc6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jan  5 21:10:22 UTC 2018
+# Wed Feb 28 00:25:02 UTC 2018
 pkgbase = peazip-qt
 	pkgdesc = QT archiver utility
-	pkgver = 6.5.0
+	pkgver = 6.5.1
 	pkgrel = 1
 	url = http://www.peazip.org/peazip-linux.html
 	install = peazip.install
@@ -24,16 +24,19 @@ pkgbase = peazip-qt
 	provides = peazip
 	conflicts = peazip-gtk2
 	conflicts = peazip-qt-build
-	noextract = peazip-qt-6.5.0.tgz
+	noextract = peazip-qt-6.5.1.tgz
 	options = !strip
-	source = peazip-qt-6.5.0.tgz::https://github.com/giorgiotani/PeaZip/releases/download/6.5.0/peazip-6.5.0.LINUX.Qt.tgz
+	source = peazip-qt-6.5.1.tgz::https://github.com/giorgiotani/PeaZip/releases/download/6.5.1/peazip-6.5.1.LINUX.Qt.tgz
 	source = http://www.peazip.org/downloads/additional/peazip_optional_formats_plugin-1.LINUX.INST.tar.gz
+	source = http://www.peazip.org/downloads/additional/peazip_additional_formats_plugin-2.LINUX.ALL.tar.gz
 	source = peazip.desktop
-	sha256sums = f2fa5479f2646352b0279a357968923dd00e8f9ed1a99d2c1c99aafd2aaed338
+	sha256sums = c812bfe387cafc78568fcdf97f536f7c3f1c036db07c68385e7fc947cfd7bc25
 	sha256sums = 7f3fc1ea200d482500360eadda9298c4d5900ca822d21b5a0e11ff9de4d499ff
+	sha256sums = 68afa72b6c53e756e6c26abd4b922c5b1188706aa1fe0979de0d611333e4bbb3
 	sha256sums = 4d876c6a61f25a7e2f3dfa69b1c80e61fdda9220bbf8e23a407e34eae377091b
-	sha512sums = ce1bacd8453d7e9fe15b67639399ff8c6426bf004151a014df9fe0c8e2df5c25077ea9e477cd357664f1f993a145081ab5d4753951c5ccf572ff3ea84e577ce3
+	sha512sums = e0c37ee62c56a73bc96a427dfd9f71e950cff1a64e3c89b43c7f215791108665ff7bd9139e44ddb05dab611340b14e931cd48d04774d4814eacde36c2e6916cd
 	sha512sums = 8b308510a2c81ad2704cef19ed3fb2baf1dde0e123cf3e4c96e5e42a330e23002f3443c9fce009120492afc82b0ab063344c8029fe6fe851a4bea4814bacdaa8
+	sha512sums = ead25542db8d5dc94ffb0334f3d78f61bc458119510da27c3e9b9b3a59d3106cde0675144df3dbb5ae061cbac093649fda49542637d8177bffda30236f32e0aa
 	sha512sums = bc86d42b33285c2709081ddca7c06fe789cc2d42c69c4cbed595c077a776d91e5526eb799dcdc404375a3bfb212927165a02d3d79301f53adb8a89039bf7bb5f
 
 pkgname = peazip-qt
diff --git a/PKGBUILD b/PKGBUILD
index baa30fba0345..cbcfa7f9e273 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: TuxSpirit <tuxspirit@archlinux.fr>
 
 pkgname=peazip-qt
-pkgver=6.5.0
+pkgver=6.5.1
 pkgrel=1
 pkgdesc="QT archiver utility"
 arch=(i686 x86_64)
@@ -12,55 +12,55 @@ license=(LGPL3)
 depends=(balz desktop-file-utils lib32-{curl,gmp4,libx11,ncurses,qt4pas} p7zip upx zpaq)
 [[ $CARCH == "i686" ]] && depends=(${depends[@]/lib32-/})
 optdepends=(quad unace)
-provides=(${pkgname%-*})
-conflicts=("${pkgname%-*}-gtk2" "${pkgname%-*}-qt-build")
+provides=(peazip)
+conflicts=("peazip-gtk2" "peazip-qt-build")
 options=('!strip')
-install=${pkgname%-*}.install
-source=("$pkgname-$pkgver.tgz"::"https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/${pkgname%-*}-$pkgver.LINUX.Qt.tgz"
+install=peazip.install
+source=("$pkgname-$pkgver.tgz"::"https://github.com/giorgiotani/PeaZip/releases/download/$pkgver/peazip-$pkgver.LINUX.Qt.tgz"
         "http://www.peazip.org/downloads/additional/peazip_optional_formats_plugin-1.LINUX.INST.tar.gz"
-        "${pkgname%-*}.desktop")
+        "http://www.peazip.org/downloads/additional/peazip_additional_formats_plugin-2.LINUX.ALL.tar.gz"
+        "peazip.desktop")
 noextract=($pkgname-$pkgver.tgz)
-sha256sums=('f2fa5479f2646352b0279a357968923dd00e8f9ed1a99d2c1c99aafd2aaed338'
+sha256sums=('c812bfe387cafc78568fcdf97f536f7c3f1c036db07c68385e7fc947cfd7bc25'
             '7f3fc1ea200d482500360eadda9298c4d5900ca822d21b5a0e11ff9de4d499ff'
+            '68afa72b6c53e756e6c26abd4b922c5b1188706aa1fe0979de0d611333e4bbb3'
             '4d876c6a61f25a7e2f3dfa69b1c80e61fdda9220bbf8e23a407e34eae377091b')
-sha512sums=('ce1bacd8453d7e9fe15b67639399ff8c6426bf004151a014df9fe0c8e2df5c25077ea9e477cd357664f1f993a145081ab5d4753951c5ccf572ff3ea84e577ce3'
+sha512sums=('e0c37ee62c56a73bc96a427dfd9f71e950cff1a64e3c89b43c7f215791108665ff7bd9139e44ddb05dab611340b14e931cd48d04774d4814eacde36c2e6916cd'
             '8b308510a2c81ad2704cef19ed3fb2baf1dde0e123cf3e4c96e5e42a330e23002f3443c9fce009120492afc82b0ab063344c8029fe6fe851a4bea4814bacdaa8'
+            'ead25542db8d5dc94ffb0334f3d78f61bc458119510da27c3e9b9b3a59d3106cde0675144df3dbb5ae061cbac093649fda49542637d8177bffda30236f32e0aa'
             'bc86d42b33285c2709081ddca7c06fe789cc2d42c69c4cbed595c077a776d91e5526eb799dcdc404375a3bfb212927165a02d3d79301f53adb8a89039bf7bb5f')
 
 package() {
-    _resdir="$pkgdir/usr/lib/${pkgname%-*}/res/"
-
-    install -d "$pkgname/"
-    cd "$pkgname/"
+    _resdir="$pkgdir/usr/lib/peazip/res/"
+    install -d "$pkgname"
+    cd "$pkgname"
     bsdtar -xf "../$pkgname-$pkgver.tgz"
-    mv "$srcdir"/res/* "$srcdir/$pkgname/usr/local/share/PeaZip/res"
-    cd "$srcdir/$pkgname/usr/local/share/PeaZip/res"
-
-    install -Dm755 "../${pkgname%-*}" "$pkgdir/usr/lib/${pkgname%-*}/${pkgname%-*}"
+    mv -n "$srcdir/res/"* "$srcdir/lpaq/"* "$srcdir/paq/"* "$srcdir/quad/"* \
+    -t "$srcdir/$pkgname/usr/local/share/PeaZip/res"
 
-    for i in pea pealauncher rnd; do
-        install -Dm755 "$i" "$_resdir/$i"
-    done
-    for i in arc/{arc,*.sfx}; do
-        install -Dm755 "$i" "$_resdir/$i"
+    cd "$srcdir/$pkgname/usr/local/share/PeaZip/res"
+    install -Dm755 "../peazip" "$pkgdir/usr/lib/peazip/peazip"
+    for _file in pea pealauncher rnd arc/{arc,*.sfx}; do
+        install -Dm755 "$_file" "$_resdir/$_file"
     done
-    for i in altconf.txt lang/* themes/{{nographic,ten}-embedded/*,*.7z} arc/arc.{ini,groups}; do
-        install -Dm644 "$i" "$_resdir/$i"
+    for _file in altconf.txt lang/* themes/{{nographic,ten}-embedded/*,*.7z} arc/arc.{ini,groups}; do
+        install -Dm644 "$_file" "$_resdir/$_file"
     done
 
-    install -d "$_resdir/7z/Codecs/"
-    for i in 7z{,a,r,.so,Con.sfx,.sfx} Codecs/Rar29.so; do
-        ln -sf "/usr/lib/p7zip/$i" "$_resdir/7z/$i"
+    install -d "$_resdir/7z/Codecs"
+    for _file in 7z{,a,r,.so,Con.sfx,.sfx} Codecs/Rar29.so; do
+        ln -sf "/usr/lib/p7zip/$_file" "$_resdir/7z/$_file"
     done
-    for i in quad/{balz,quad} unace/unace upx/upx lpaq/lpaq8 paq/paq8o zpaq/zpaq; do
-        install -d "$_resdir/$(dirname $i)/"
-        ln -sf "/usr/bin/$(basename $i)" "$_resdir/$i"
+    for _file in quad/{balz,quad} unace/unace upx/upx lpaq/lpaq8 paq/paq8o zpaq/zpaq; do
+        install -d "$_resdir/$(dirname $_file)"
+        ln -sf "/usr/bin/$(basename $_file)" "$_resdir/$_file"
     done
-    install -d "$pkgdir/usr/bin/"
-    for i in "/usr/lib/${pkgname%-*}"/{"${pkgname%-*}",res/pea,res/pealauncher}; do
-        ln -sf "$i" "$pkgdir/usr/bin/$(basename $i)"
+
+    install -d "$pkgdir/usr/bin"
+    for _file in "/usr/lib/peazip"/{"peazip",res/pea,res/pealauncher}; do
+        ln -sf "$_file" "$pkgdir/usr/bin/$(basename $_file)"
     done
 
-    install -Dm644 "$srcdir/$pkgname/usr/local/share/icons/${pkgname%-*}.png" "$pkgdir/usr/share/pixmaps/${pkgname%-*}.png"
+    install -Dm644 "$srcdir/$pkgname/usr/local/share/icons/peazip.png" "$pkgdir/usr/share/pixmaps/peazip.png"
     desktop-file-install --dir "$pkgdir/usr/share/applications/" "$srcdir/peazip-qt/opt/kde3/share/applications/kde/peazip.desktop"
 }