some updates

4 files changed, 47 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be42eabadedc..2da08d616f8b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,25 @@
 pkgbase = volumeicon-gtk2
-	pkgdesc = Volume control for your system tray (compiled for gtk2)
+	pkgdesc = Volume control for the system tray (gtk2)
 	pkgver = 0.5.1
-	pkgrel = 2
-	url = http://softwarebakery.com/maato/volumeicon.html
+	pkgrel = 4
+	url = https://softwarebakery.com/maato/volumeicon.html
+	install = volumeicon.install
 	arch = x86_64
 	arch = i686
 	license = GPL3
+	makedepends = git
 	makedepends = intltool
-	depends = gtk2
 	depends = alsa-lib
+	depends = gtk2
 	depends = libnotify
-	provides = volumeicon
+	provides = volumeicon=0.5.1-4
 	conflicts = volumeicon
 	source = http://softwarebakery.com/maato/files/volumeicon/volumeicon-0.5.1.tar.gz
 	source = gtk2.patch
+	source = volumeicon.desktop
 	sha256sums = 24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0
 	sha256sums = 7980d0eadfeea474b51d4e43aecde9c28c5c91729b8601acf9472300fb1bdc2a
+	sha256sums = 3f989bce3a080b2446af6d7ed7e8a22dfd3019f888a7b11a0759bf7cf704f975
 
 pkgname = volumeicon-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index ef480e2a2f67..0c9bf07b6e37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,44 @@
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Maato <maato softwarebakery com>
-
-# TODO: Consider adding an install-time message about
-#       removing ~/.config/volumeicon/volumeicon if there are
-#       problems running volumeicon. Ref FS#34239
-
 pkgname=volumeicon-gtk2
 _pkgname=volumeicon
 pkgver=0.5.1
-pkgrel=2
-pkgdesc='Volume control for your system tray (compiled for gtk2)'
-arch=('x86_64' 'i686')
-url='http://softwarebakery.com/maato/volumeicon.html'
-license=('GPL3')
-provides=(${_pkgname})
-conflicts=(${_pkgname})
-depends=('gtk2' 'alsa-lib' 'libnotify')
-makedepends=('intltool')
+pkgrel=4
+pkgdesc='Volume control for the system tray (gtk2)'
+arch=(x86_64 i686)
+url='https://softwarebakery.com/maato/volumeicon.html'
+license=(GPL3)
+depends=(alsa-lib gtk2 libnotify)
+makedepends=(git intltool)
+install=volumeicon.install
 source=("http://softwarebakery.com/maato/files/volumeicon/$_pkgname-$pkgver.tar.gz"
-        gtk2.patch)
+        gtk2.patch
+        volumeicon.desktop)
 sha256sums=('24b8c1d0a81d708b201ce6e67301fc175d65588d892d01859f667b8db8a05da0'
-            '7980d0eadfeea474b51d4e43aecde9c28c5c91729b8601acf9472300fb1bdc2a')
+            '7980d0eadfeea474b51d4e43aecde9c28c5c91729b8601acf9472300fb1bdc2a'
+            '3f989bce3a080b2446af6d7ed7e8a22dfd3019f888a7b11a0759bf7cf704f975')
+
+provides=($_pkgname=$pkgver-$pkgrel)
+conflicts=($_pkgname)
 
 prepare() {
-  cd "$_pkgname-$pkgver"
+  cd $_pkgname-$pkgver
 
   patch -Np2 -b -z .orig -i ../gtk2.patch
   autoreconf -fi
 }
 
 build() {
-  cd "$_pkgname-$pkgver"
-
-  ./configure \
-    --prefix=/usr \
-    --enable-notify
-  make V=0
+  cd $_pkgname-$pkgver
+  ./configure --prefix=/usr --enable-notify
+  make
 }
 
 package() {
-  make -C "$_pkgname-$pkgver" DESTDIR="$pkgdir" install
+  make -C $_pkgname-$pkgver DESTDIR="$pkgdir" install
+  install -Dm644 volumeicon.desktop "$pkgdir/usr/share/applications/volumeicon.desktop"
   rm -f "$pkgdir/usr/share/volumeicon/gui/*.orig"
 }
 
-# vim:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
diff --git a/volumeicon.desktop b/volumeicon.desktop
new file mode 100644
index 000000000000..d67884aec77c
--- /dev/null
+++ b/volumeicon.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Volume Icon
+Comment=Lightweight volume control for the systray
+Exec=volumeicon
+Icon=multimedia-volume-control
+Type=Application
+Terminal=false
+StartupNotify=false
+Categories=GTK;AudioVideo;Audio;Mixer;
diff --git a/volumeicon.install b/volumeicon.install
new file mode 100644
index 000000000000..582cc86731c3
--- /dev/null
+++ b/volumeicon.install
@@ -0,0 +1,7 @@
+post_install() {
+  # See FS#34239 for more information
+  echo 'If there are problems running volumeicon, try:'
+  echo 'rm -iv ~/.config/volumeicon/volumeicon'
+}
+
+# vim:set ts=2 sw=2 et: