separate mime to remove conflicts with qqsp; remove install file - pacman hooks do this things automaticly

4 files changed, 21 insertions, 81 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b25e6e346019..7568bec52045 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,24 @@
 pkgbase = qsp-bin
-	pkgdesc = Quest Soft Player is another interactive fiction player (only for qsp format)
+	pkgdesc = Quest Soft Player is a interactive fiction stories and games player (only for qsp format)
 	pkgver = 5.7.0
-	pkgrel = 4
+	pkgrel = 5
 	url = http://qsp.su/
-	install = qsp-gui.install
 	arch = i686
 	arch = x86_64
 	license = GPL
 	license = LGPL
+	depends = qsp-common
 	depends = libjpeg6-turbo
 	depends = libpng12
 	depends = gtk2
 	depends = cairo
 	depends = libsm
-	source = http://qsp.su/attachments/qsp570.tar.bz2
-	source = https://raw.githubusercontent.com/QSPFoundation/qsp/45c4e7180704b2940e547eb041bbc5b57c46d9e2/help/qsp-logo-vector.svg
+	source = http://qsp.su/attachments/qsp570_64.tar.bz2
 	source = qsp-qui.sh
 	source = qsp-gui.desktop
-	source = qsp.mime
 	sha256sums = 0d1f22209fd0ab39c64b8834634f599de16ac96cb03b30ab385ce57a5eb6022f
-	sha256sums = 12de4d6a91bdc09d334585b04dbb3d2e9ae7277f0274090b9f73c812d414e5dc
 	sha256sums = ce1ebd984d333cf6ea052875c3c7573ad3837474859eb8a58c29466c9f549255
 	sha256sums = d2a84ebbc0d2c40200781791f2a8a10d126bf93b053532377b872c3d723bc130
-	sha256sums = 02fe02b6464e7eb116bc81faba2db365d928cffd34fb4803e38b02b73407ad77
 
 pkgname = qsp-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index dd8998068bc1..e4db202ce73e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,34 @@
 # Maintainer: 3ED <krzysztof1987@gmail.com>
 pkgname=qsp-bin
 pkgver=5.7.0
-pkgrel=4
-pkgdesc="Quest Soft Player is another interactive fiction player (only for qsp format)"
+pkgrel=5
+pkgdesc="Quest Soft Player is a interactive fiction stories and games player (only for qsp format)"
 arch=('i686' 'x86_64')
 url="http://qsp.su/"
 license=('GPL' 'LGPL')
-depends=('libjpeg6-turbo' 'libpng12' 'gtk2' 'cairo' 'libsm')
-install=qsp-gui.install
+depends=('qsp-common' 'libjpeg6-turbo' 'libpng12' 'gtk2' 'cairo' 'libsm')
 _tarname="qsp${pkgver//\./}"
 
 [ "$CARCH" = "x86_64" ] && _tarname="${_tarname}_64"
 
-source=("http://qsp.su/attachments/${_tarname}.tar.bz2"
-        "https://raw.githubusercontent.com/QSPFoundation/qsp/45c4e7180704b2940e547eb041bbc5b57c46d9e2/help/qsp-logo-vector.svg"
-        "qsp-qui.sh"
-        "qsp-gui.desktop"
-        "qsp.mime")
-sha256sums=('0d1f22209fd0ab39c64b8834634f599de16ac96cb03b30ab385ce57a5eb6022f'
-            '12de4d6a91bdc09d334585b04dbb3d2e9ae7277f0274090b9f73c812d414e5dc'
-            'ce1ebd984d333cf6ea052875c3c7573ad3837474859eb8a58c29466c9f549255'
-            'd2a84ebbc0d2c40200781791f2a8a10d126bf93b053532377b872c3d723bc130'
-            '02fe02b6464e7eb116bc81faba2db365d928cffd34fb4803e38b02b73407ad77')
+source=(
+	"http://qsp.su/attachments/${_tarname}.tar.bz2"
+	"qsp-qui.sh"
+	"qsp-gui.desktop"
+)
+sha256sums=(
+	'0d1f22209fd0ab39c64b8834634f599de16ac96cb03b30ab385ce57a5eb6022f'
+	'ce1ebd984d333cf6ea052875c3c7573ad3837474859eb8a58c29466c9f549255'
+	'd2a84ebbc0d2c40200781791f2a8a10d126bf93b053532377b872c3d723bc130'
+)
 
 [ "$CARCH" = "x86_64" ] && sha256sums[0]='0d1f22209fd0ab39c64b8834634f599de16ac96cb03b30ab385ce57a5eb6022f'
 
-prepare() {
-  cd "$srcdir"
-
-  install -dm755 "$srcdir/hicolor/scalable/apps/"
-  install -m644 "$srcdir/qsp-logo-vector.svg" "$srcdir/hicolor/scalable/apps/qsp.svg"
-
-  for i in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256; do
-    install -dm755 "$srcdir/hicolor/$i/apps/"
-    rsvg-convert -w "${i%%x*}" -h "${i##*x}" -f png \
-      -o "$srcdir/hicolor/$i/apps/qsp.png" "$srcdir/qsp-logo-vector.svg"
-  done
-}
 package() {
-  install -dm755 "$pkgdir"/usr/{bin,lib/qsp,share/{applications,icons,mime/packages}}
-  install -m755 "$srcdir/qsp-qui.sh" "$pkgdir/usr/bin/qsp-gui"
-  install -m644 "$srcdir/qsp-gui.desktop" "$pkgdir/usr/share/applications/"
-  install -m644 "$srcdir/qsp.mime" "$pkgdir/usr/share/mime/packages/qsp.xml"
-
-  cd "$srcdir"
-	bsdtar -cf - hicolor | bsdtar -xf - -C "$pkgdir/usr/share/icons/"
+	install -dm755 "$pkgdir"/usr/{bin,lib/qsp,share/applications}
+	install -m755 "$srcdir/qsp-qui.sh" "$pkgdir/usr/bin/qsp-gui"
+	install -m644 "$srcdir/qsp-gui.desktop" "$pkgdir/usr/share/applications/"
 
-  cd "$_tarname"
+	cd "$_tarname"
 	bsdtar -cf - * | bsdtar -xf - -C "$pkgdir/usr/lib/qsp/"
 }
diff --git a/qsp-gui.install b/qsp-gui.install
deleted file mode 100644
index a0611f7a3229..000000000000
--- a/qsp-gui.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor
-  update-desktop-database -q
-  update-mime-database usr/share/mime > /dev/null 2>&1
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/qsp.mime b/qsp.mime
deleted file mode 100644
index d3ab70e2760d..000000000000
--- a/qsp.mime
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-qsp">
-    <comment>QSP interactive fiction</comment>
-    <comment xml:lang="en">QSP interactive fiction</comment>
-    <comment xml:lang="pl">QSP fikcja interaktywna</comment>
-    <icon name="qsp"/>
-    <magic priority="50">
-      <match value="Q\0S\0P\0G\0A\0M\0E\0\r" type="string" offset="0" />
-    </magic>
-    <glob pattern="*.qsp"/>
-  </mime-type>
-  <mime-type type="application/x-qsp-sav">
-    <comment>QSP interactive fiction (save game)</comment>
-    <comment xml:lang="en">QSP interactive fiction (save game)</comment>
-    <comment xml:lang="pl">QSP fikcja interaktywna (zapis gry)</comment>
-    <magic priority="50">
-      <match value="Q\0\0\0S\0\0\0P\0\0\0S\0\0\0A" type="string" offset="0">
-        <match value="M\0\0\0E\0\0\0\r" type="string" offset="40" />
-      </match>
-    </magic>
-    <glob pattern="*.sav"/>
-  </mime-type>
-</mime-info>