From bf35116f9d203dcafce808a6c7b3dd5a0db8afbc Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Tue, 2 Aug 2011 04:35:55 +0000
Subject: Tue Aug  2 04:35:55 UTC 2011

---
 community/mpdscribble/PKGBUILD            | 16 ++++++++--------
 community/mpdscribble/mpdscribble.install |  9 +++++++--
 2 files changed, 15 insertions(+), 10 deletions(-)

(limited to 'community/mpdscribble')

diff --git a/community/mpdscribble/PKGBUILD b/community/mpdscribble/PKGBUILD
index 254c0ac05..d59e15732 100644
--- a/community/mpdscribble/PKGBUILD
+++ b/community/mpdscribble/PKGBUILD
@@ -3,21 +3,21 @@
 # Contributor: Luiz Ribeiro <luizribeiro@gmail.com>
 
 pkgname=mpdscribble
-pkgver=0.21
-pkgrel=4
+pkgver=0.22
+pkgrel=2
 pkgdesc='An mpd client which submits track info to last.fm'
 url='http://mpd.wikia.com/wiki/Client:Mpdscribble'
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libsoup' 'glib2' 'libmpdclient')
-install="${pkgname}.install"
+install='mpdscribble.install'
 source=("http://downloads.sourceforge.net/musicpd/mpdscribble-${pkgver}.tar.bz2"
         'mpdscribble')
-md5sums=('3dc96f9179b8d7efd02cbbceb345e529'
+md5sums=('652ee927b797e9a4cef45494e77047db'
          'f54c937c7b3ab8e4d39e4b903c2993fc')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd mpdscribble-${pkgver}
 
   ./configure \
     --prefix=/usr \
@@ -28,7 +28,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd mpdscribble-${pkgver}
 
   make DESTDIR=${pkgdir} install
 
@@ -36,8 +36,8 @@ package() {
     ${pkgdir}/etc/rc.d/mpdscribble
 
   # default config is really an example
-  install -m644 ${pkgdir}/etc/mpdscribble.conf \
-    ${pkgdir}/etc/mpdscribble.conf.example
+  install -D -m644 ${pkgdir}/etc/mpdscribble.conf \
+    ${pkgdir}/usr/share/mpdscribble/mpdscribble.conf.example
   rm -f ${pkgdir}/etc/mpdscribble.conf
 
   install -d ${pkgdir}/var/cache/mpdscribble
diff --git a/community/mpdscribble/mpdscribble.install b/community/mpdscribble/mpdscribble.install
index 3447b50d6..e7038d5d8 100644
--- a/community/mpdscribble/mpdscribble.install
+++ b/community/mpdscribble/mpdscribble.install
@@ -1,13 +1,18 @@
 post_install() {
-  echo 'An example config is provided in /etc/mpdscribble.conf.example'
+  echo 'An example config is provided in /usr/share/mpdscribble/mpdscribble.conf.example'
   echo
   echo 'For system-wide config copy this file to /etc/mpdscribble.conf'
   echo 'For per-user config copy this file to ~/.mpdscribble/mpdscribble.conf'
 }
 
+## arg 1:  the new package version
+## arg 2:  the old package version
 pre_upgrade() {
   # removed /etc/mpdscribble.conf on FEB 19 2011
-  if [ -f /etc/mpdscribble.conf ]; then
+  # only display warning for people with mpdscribble older then 0.21
+  if (( "$(vercmp 0.21-1 $2)" > 0 )) && [[ -f /etc/mpdscribble.conf ]]
+  then
+    echo "$1 is new $2 is old"
     cp /etc/mpdscribble.conf /etc/mpdscribble.conf.oldbackup
     echo 'The package does not provide /etc/mpdscribble.conf anymore.'
     echo 'Copied /etc/mpdscribble.conf to /etc/mpdscribble.conf.oldbackup'
-- 
cgit v1.2.3-54-g00ecf