Fix GhostView bug, add dependencies and application menu entry.

5 files changed, 51 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c200cf3f6db7..27c7931064e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,21 @@
 pkgbase = cdcover
-	pkgdesc = cdcover allows the creation of inlay-sheets for cd-cases and dvd's
+	pkgdesc = Create CD/DVD jewel case inlets
 	pkgver = 0.7.4
-	pkgrel = 6
+	pkgrel = 7
 	url = http://cdcover.sourceforge.net
-	install = cdcover.install
 	arch = x86_64
-	license = GPL
+	license = GPL2
 	depends = python2
 	depends = tk
-	source = http://downloads.sourceforge.net/sourceforge/cdcover/cdcover-0.7.4.tar.gz
-	md5sums = ab54e927e1c2f9210062ae9425cea669
+	depends = gv
+	depends = cd-discid
+	depends = cddb-py
+	source = https://downloads.sourceforge.net/sourceforge/cdcover/cdcover-0.7.4.tar.gz
+	source = cdcover.desktop
+	source = cdcover.png
+	sha1sums = 5f796c26c6d6131ee176d70f682ce11c216662b2
+	sha1sums = 367130014fb1978c4b48285ac7ada760d7a14563
+	sha1sums = 5807c278c96c0071b74e4005045a5d40cafcc375
 
 pkgname = cdcover
 
diff --git a/PKGBUILD b/PKGBUILD
index ee80e726199c..630ae3d3b8bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Roland Schaeuble <rschaeuble@gmx.ch>
+# Maintainer: mrxx <mrxx at cyberhome dot at>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: Roland Schaeuble <rschaeuble@gmx.ch>
 
 pkgname=cdcover
 pkgver=0.7.4
-pkgrel=6
-pkgdesc="cdcover allows the creation of inlay-sheets for cd-cases and dvd's"
+pkgrel=7
+pkgdesc="Create CD/DVD jewel case inlets"
 arch=('x86_64')
 url="http://cdcover.sourceforge.net"
-license=('GPL')
-depends=('python2' 'tk')
-install='cdcover.install'
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('ab54e927e1c2f9210062ae9425cea669')
+license=('GPL2')
+depends=('python2' 'tk' 'gv' 'cd-discid' 'cddb-py')
+source=("https://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" 'cdcover.desktop' 'cdcover.png')
+sha1sums=('5f796c26c6d6131ee176d70f682ce11c216662b2'
+          '367130014fb1978c4b48285ac7ada760d7a14563'
+          '5807c278c96c0071b74e4005045a5d40cafcc375')
 
 build() {
   cd "$srcdir"/$pkgname
@@ -21,15 +22,34 @@ build() {
   sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' src/cdcover.py
 
   patch -p0 Makefile <<EOF
+4c4
+< docdir=\$(prefix)/doc/cdcover
+---
+> docdir=\$(prefix)/share/doc/cdcover
+12c12
+< DOCFILES=BUGS COPYING INSTALL README VERSION
+---
+> DOCFILES=COPYING INSTALL README VERSION
 13c13
 < IMAGEFILES=autonum.gif cddb.gif exit.gif gv.gif logo.gif nocddb.gif ps.gif
 ---
 > IMAGEFILES=application-exit.gif cddb.gif document-print-preview.gif document-save.gif logo.gif nocddb.gif renumber.gif
 EOF
+
+  patch -p0 dotcdcover.m4 <<EOF
+6c6                                                                                                 
+<   <ghostview path="/usr/bin/ggv"/>
+---
+>   <ghostview path="/usr/bin/gv"/>
+EOF
 }
 
 package() {
   cd "$srcdir"/$pkgname
   make target=/usr prefix="$pkgdir"/usr install
-  rm -rf "$pkgdir"/usr/doc
+
+  mkdir -p -m 755 $pkgdir/usr/share/{applications,icons/hicolor/48x48/apps}
+  install -Dm644 doc/cdcover.pdf "$pkgdir/usr/share/doc/$pkgname"
+  install -Dm644 "$srcdir/${pkgname}.desktop" "$pkgdir/usr/share/applications/"
+  install -Dm644 "$srcdir/${pkgname}.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/"
 }
diff --git a/cdcover.desktop b/cdcover.desktop
new file mode 100644
index 000000000000..398b807cea74
--- /dev/null
+++ b/cdcover.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=cdcover
+Comment=Create CD/DVD jewel case inserts
+Exec=/usr/bin/cdcover
+Icon=/usr/share/icons/hicolor/48x48/apps/cdcover.png
+Terminal=false
+Type=Application
+Categories=Application;AudioVideo;
diff --git a/cdcover.install b/cdcover.install
deleted file mode 100644
index 5df4b5c8a22e..000000000000
--- a/cdcover.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install()
-{
-  echo "Installation of a postscript viewer such as 'gv' or 'ggv'"
-  echo "is highly recommended."
-  echo "To benefit from cddb features, installation of 'discid'"
-  echo "and 'pycddb' is required."
-}
diff --git a/cdcover.png b/cdcover.png
new file mode 100644
index 000000000000..68cba03b6bba
--- /dev/null
+++ b/cdcover.png