dependency on deb2targz deleted; desktop menu category fixed

2 files changed, 9 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb01153ca655..00fb08b6262a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = azardi
 	pkgdesc = The AZARDI book reader by Infogrid Pacific Pte Ltd.
 	pkgver = 43.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://azardi.infogridpacific.com/
 	install = _.install
 	arch = x86_64
 	arch = i686
 	license = custom:azardi
-	makedepends = deb2targz
 	source = https://azardi-download.s3.amazonaws.com/AZARDI_43.1_20160728_amd64.deb
 	source = license.html::http://azardi.infogridpacific.com/azardi-license.html
 	sha512sums = 3e4ac185f3a975f9ab335e3fe5fa86d693e61af50aba4b3024f06b1c021e119a03728a2b2dbfe1fece394fb4062daed8f4925b25dc18a607762e9360963895de
diff --git a/PKGBUILD b/PKGBUILD
index bc91d00a15c9..4ff1a95e5a5b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,9 @@
 # Maintainer: Roman Beslik <me@beroal.in.ua>
 pkgname=azardi
 pkgver=43.1
-pkgrel=1
+pkgrel=2
 arch=("x86_64" "i686")
 url="http://azardi.infogridpacific.com/"
-makedepends=("deb2targz")
 pkgdesc="The AZARDI book reader by Infogrid Pacific Pte Ltd."
 if [ "$CARCH" = "x86_64" ]; then
 	_arch_file_name="amd64"
@@ -21,13 +20,16 @@ source=("https://azardi-download.s3.amazonaws.com/$_deb_file_name.deb"
 	"license.html::http://azardi.infogridpacific.com/azardi-license.html")
 license=("custom:azardi")
 install="_.install"
+_src_bin_dir="pkg"
 build() {
-	deb2targz "$srcdir/$_deb_file_name.deb"
+	cd "$srcdir"
+	FILE_NAME=$(find . -name "data.*")
+	mkdir --parents "$_src_bin_dir"
+	tar --extract --auto-compress "--file=$FILE_NAME" -C "$_src_bin_dir"
+	sed -i "s/Categories=Application;/Categories=Office;Viewer;/" "$_src_bin_dir/usr/share/applications/AZARDI.desktop"
 }
 package() {
-	cd "$srcdir"
-	FILE_NAME=$(find . -name "$_deb_file_name.tar*")
-	tar --extract --auto-compress "--file=$FILE_NAME" -C "$pkgdir"
+	cp -r "$srcdir/$_src_bin_dir"/* "$pkgdir"
 	# /opt/infogridpacific/azardi/LICENSE is the Mozilla license. WTF?
 	install --mode=0644 -D "--target-directory=$pkgdir/usr/share/licenses/$pkgname" "$srcdir/license.html"
 }