0.1.20, cleanup; symlink binary, fix libgranite error

2 files changed, 30 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52ca6dad6402..80d1378ac10a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = image-optimizer-bin
 	pkgdesc = Simple lossless image compression
-	pkgver = 0.1.17
+	pkgver = 0.1.20
 	pkgrel = 1
 	url = https://github.com/gijsgoudzwaard/image-optimizer
 	arch = x86_64
 	license = MIT
 	depends = granite
-	depends = jpegoptim
 	depends = optipng
+	depends = jpegoptim
 	provides = image-optimizer
-	source = http://packages.elementary.io/appcenter/pool/main/c/com.github.gijsgoudzwaard.image-optimizer/com.github.gijsgoudzwaard.image-optimizer0.1.17-64559e.deb
-	source = image-optimizer-bin-0.1.17-LICENSE::https://github.com/gijsgoudzwaard/image-optimizer/raw/0.1.17/LICENSE
-	sha256sums = c2eefbaaf5f9392e6d01e240da27b21a4533165d26cf47a66399a5f3c6e84115
+	conflicts = image-optimizer
+	source = http://packages.elementary.io/appcenter/pool/main/c//com.github.gijsgoudzwaard.image-optimizer/com.github.gijsgoudzwaard.image-optimizer0.1.20-06ef81.deb
+	source = LICENSE0.1.20::https://github.com/gijsgoudzwaard/image-optimizer/raw/0.1.20/LICENSE
+	sha256sums = e2a2b17816950d75bfa19f7a57bcf58523cd272ff6ccc10c2a288fc7fee25583
 	sha256sums = 6477678e949d04b38104a51115dc9f2978cb34c7c98aa56865babf8b50277c21
 
 pkgname = image-optimizer-bin
-
diff --git a/PKGBUILD b/PKGBUILD
index cd1d64ed3695..780b43301c7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,27 +1,34 @@
-# Maintainer: Caltlgin Stsodaat <contact@fossdaily.xyz>
+# Maintainer: begin-theadventure <begin-thecontact.ncncb at dralias dot com>
+# Contributor: Caltlgin Stsodaat <contact@fossdaily.xyz>
 
-_binary_name='com.github.gijsgoudzwaard.image-optimizer'
-_pkgname="${_binary_name##*.}"
-pkgname="${_pkgname}-bin"
-pkgver=0.1.17
+_pkgname=image-optimizer
+pkgname=$_pkgname-bin
+pkgver=0.1.20
 pkgrel=1
-_pkg_hash='64559e' # <-- NB: update on new version
 pkgdesc='Simple lossless image compression'
 arch=('x86_64')
 url='https://github.com/gijsgoudzwaard/image-optimizer'
-_pool_url='http://packages.elementary.io/appcenter/pool/main'
 license=('MIT')
-depends=('granite' 'jpegoptim' 'optipng')
-provides=("${_pkgname}")
-source=("${_pool_url}/${_binary_name::1}/${_binary_name}/${_binary_name}${pkgver}-${_pkg_hash}.deb"
-        "${pkgname}-${pkgver}-LICENSE::${url}/raw/${pkgver}/LICENSE")
-sha256sums=('c2eefbaaf5f9392e6d01e240da27b21a4533165d26cf47a66399a5f3c6e84115'
+depends=('granite' 'optipng' 'jpegoptim')
+conflicts=($_pkgname)
+provides=($_pkgname)
+_pool_url='http://packages.elementary.io/appcenter/pool/main/c/'
+_binary_name='com.github.gijsgoudzwaard.image-optimizer'
+_pkg_hash='06ef81'
+source=("$_pool_url/$_binary_name/$_binary_name$pkgver-$_pkg_hash.deb"
+        "LICENSE$pkgver::$url/raw/$pkgver/LICENSE")
+sha256sums=('e2a2b17816950d75bfa19f7a57bcf58523cd272ff6ccc10c2a288fc7fee25583'
             '6477678e949d04b38104a51115dc9f2978cb34c7c98aa56865babf8b50277c21')
 
 package() {
-  tar -xvf data.tar.xz -C "${pkgdir}"
-  rm -rf "${pkgdir}/usr/share/doc"
-  install -Dm644 "${pkgname}-${pkgver}-LICENSE" "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
+# Create a folder
+  mkdir -p "$pkgdir/usr/lib"
+# Install
+  tar -xf data.tar.xz -C "$pkgdir"
+  ln -s $_binary_name "$pkgdir/usr/bin/$_pkgname"
+  install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/$_pkgname"
+# Fix error
+  ln -s /lib/libgranite.so "$pkgdir/usr/lib/libgranite.so.5"
+# Clean up
+  rm -dr "$pkgdir/usr/share/contractor" "$pkgdir/usr/share/doc/$_binary_name/copyright"
 }
-
-# vim: ts=2 sw=2 et: