Updated to fit Packaging Guidelines

4 files changed, 35 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35faf2a626e6..13a7354d7215 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Feb  8 07:46:56 UTC 2016
+# Wed Apr 20 12:43:12 UTC 2016
 pkgbase = ampache
-	pkgdesc = A PHP-based tool for managing and playing your audio/video files via a web interface
+	pkgdesc = PHP web based audio/video streaming application and file manager
 	pkgver = 3.8.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ampache.org/
 	install = ampache.install
 	arch = i686
@@ -20,8 +20,10 @@ pkgbase = ampache
 	conflicts = ampache-development
 	source = https://github.com/ampache/ampache/releases/download/3.8.2/ampache-3.8.2_all.zip
 	source = nginx-example.conf
+	source = ampache.install
 	sha256sums = b54a4f08248c4389e98ce3f680da0bbc1c19e388e379e6920dc601947acaa3e2
-	sha256sums = efb63c0ac7e6462ee5c705b9c1998a1d2462502e19e7e5c97fce2c5142b8e62e
+	sha256sums = d579f125fc85b6862dc2bd950b6aa3a4ffdad219323b8ee2c93282c8f223c3eb
+	sha256sums = d53772c72f2cee184f2b150dc29b86c34f3d603a0fa427b7cff942aaa219b128
 
 pkgname = ampache
 
diff --git a/PKGBUILD b/PKGBUILD
index 494405290cbe..3293e89b6b73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,8 @@
 #Maintainer: max-k <max-k AT post DOT com>
-#Contributor: Zavon <zavon at zavon dot org>
-#Contributor: Jonathan 'gishten' Gustafsson <mynick AT mynick DOT com>
-#Contributor: Diego <cdprincipe@gmail.com
 pkgname=ampache
 pkgver=3.8.2
-pkgrel=1
-pkgdesc="A PHP-based tool for managing and playing your audio/video files via a web interface"
+pkgrel=2
+pkgdesc="PHP web based audio/video streaming application and file manager"
 arch=('i686' 'x86_64')
 url="http://www.ampache.org/"
 license=('GPL')
@@ -16,11 +13,14 @@ optdepends=('lame: all transcoding/downsampling'
                 'faad2: m4a transcoding/downsampling'
                 'mp3splt: mp3 and ogg transcoding/downsampling')
 conflicts=('ampache-git' 'ampache-development')
-install=${pkgname}.install
-source=(https://github.com/${pkgname}/${pkgname}/releases/download/${pkgver}/${pkgname}-${pkgver}_all.zip
-        'nginx-example.conf')
+install="${pkgname}.install"
+_sourcebase="https://github.com/${pkgname}/${pkgname}/releases/download"
+source=("${_sourcebase}/${pkgver}/${pkgname}-${pkgver}_all.zip"
+        "nginx-example.conf"
+        "${pkgname}.install")
 sha256sums=('b54a4f08248c4389e98ce3f680da0bbc1c19e388e379e6920dc601947acaa3e2'
-            'efb63c0ac7e6462ee5c705b9c1998a1d2462502e19e7e5c97fce2c5142b8e62e')
+            'd579f125fc85b6862dc2bd950b6aa3a4ffdad219323b8ee2c93282c8f223c3eb'
+            'd53772c72f2cee184f2b150dc29b86c34f3d603a0fa427b7cff942aaa219b128')
 
 build() {
   echo "" > /dev/null
@@ -28,10 +28,12 @@ build() {
 
 package() {
   cd ${srcdir}
-  mkdir -p ${pkgdir}/srv/http/${pkgname}
-  cp -r * ${pkgdir}/srv/http/${pkgname}/
-  unlink ${pkgdir}/srv/http/${pkgname}/${pkgname}-${pkgver}_all.zip
-  unlink ${pkgdir}/srv/http/${pkgname}/nginx-example.conf
-  mkdir -p ${pkgdir}/usr/share/doc/${pkgname}
-  install -D -m644 ${srcdir}/nginx-example.conf ${pkgdir}/usr/share/doc/${pkgname}/
+  _targetdir="${pkgdir}/usr/share/webapps/${pkgname}"
+  _docdir="${pkgdir}/usr/share/doc/${pkgname}"
+  mkdir -p ${_targetdir}
+  cp -r * ${_targetdir}/
+  unlink ${_targetdir}/${pkgname}-${pkgver}_all.zip
+  unlink ${_targetdir}/nginx-example.conf
+  mkdir -p ${_docdir}
+  install -D -m644 ${srcdir}/nginx-example.conf ${_docdir}/
 }
diff --git a/ampache.install b/ampache.install
index d140698196d2..ee7a14a94b72 100644
--- a/ampache.install
+++ b/ampache.install
@@ -21,5 +21,14 @@ EOF
 }
 
 post_upgrade() {
-	post_install
+    if [ $(vercmp $2 3.8.2-2) -lt 0 ]; then
+        cat << EOF
+==> Warning : Path has been updated to fit Archlinux Packaging Guidelines
+    From : /srv/http/ampache
+    To : /usr/share/webapps/ampache
+    Please update your virtualhosts.
+
+EOF
+    fi
+    post_install
 }
diff --git a/nginx-example.conf b/nginx-example.conf
index 1ec364ff4b7d..f0a1645fad21 100644
--- a/nginx-example.conf
+++ b/nginx-example.conf
@@ -3,7 +3,7 @@ server {
    server_name FQDN;
    charset utf-8;
 
-   root /srv/http/ampache;
+   root /usr/share/webapps/ampache;
    index index.php;
 
    access_log /var/log/nginx/ampache.access.log;
@@ -78,7 +78,7 @@ server {
      try_files  $uri =404;
      fastcgi_pass   unix:/run/php-fpm/php-fpm.sock;
      fastcgi_index  index.php;
-     fastcgi_param  PHP_ADMIN_VALUE "open_basedir=/tmp/:/srv/http/ampache/:/var/log:/usr/bin";
+     fastcgi_param  PHP_ADMIN_VALUE "open_basedir=/tmp/:/usr/share/webapps/ampache/:/var/log:/usr/bin";
      include        /etc/nginx/fastcgi_params;
      fastcgi_param  SCRIPT_FILENAME  $document_root/$fastcgi_script_name;
    }