fixing some pkgbuild issues...

2 files changed, 42 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bcf93c3a1ec8..3c9ee8c274f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = freeswitch-git
-	pkgdesc = An opensource and free (libre, price) telephony system, similar to Asterisk.
-	pkgver = 1.5.7.r2590.g46cf8a4
-	pkgrel = 3
+pkgbase = freeswitch
+	pkgdesc = An opensource and free (libre, price) telephony system, similar to Asterisk (git version).
+	pkgver = 1.6
+	pkgrel = 1
 	url = http://freeswitch.org/
 	install = freeswitch.install
 	changelog = ChangeLog
@@ -10,8 +10,8 @@ pkgbase = freeswitch-git
 	license = MPL
 	makedepends = git
 	makedepends = libjpeg
-	makedepends = libedit
 	makedepends = ldns
+	makedepends = libedit
 	makedepends = curl
 	makedepends = python2
 	makedepends = unixodbc
@@ -46,5 +46,5 @@ pkgbase = freeswitch-git
 	md5sums = e6411d793501c29ec4afd6d54018de1b
 	md5sums = 31cd89e02ec3cc52769489a30ccf6c9b
 
-pkgname = freeswitch-git
+pkgname = freeswitch
 
diff --git a/PKGBUILD b/PKGBUILD
index a5841b9e72b0..eb651206f88d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer: Brent Saner <bts (at) phreewifi (dot) org>
+# Maintainer: Brent Saner <r00t (at) square-r00t (dot) net>
 # Contributor: TJ Vanderpoel <tj@rubyists.com>
 
 ## MAINTAINER NOTE BEGIN
@@ -67,30 +67,54 @@ _disabled_modules=(languages/mod_spidermonkey
 #                                              #
 
 
-pkgname=freeswitch-git
-pkgver=1.5.7.r2590.g46cf8a4
-pkgrel=3
-pkgdesc="An opensource and free (libre, price) telephony system, similar to Asterisk."
-arch=('i686' 'x86_64')
+pkgname='freeswitch'
+pkgver='1.6'
+pkgrel='1'
+pkgdesc="An opensource and free (libre, price) telephony system, similar to Asterisk (git version)."
+arch=('i686'
+      'x86_64')
 url="http://freeswitch.org/"
 license=('MPL')
-depends=('curl' 'xz' 'python' 'libtheora' 'unixodbc' 'libvorbis' 'speex' 'libjpeg-turbo' 'postgresql-libs')
+depends=('curl'
+         'xz'
+         'python'
+         'libtheora'
+         'unixodbc'
+         'libvorbis'
+         'speex'
+         'libjpeg-turbo'
+         'postgresql-libs')
 # per https://wiki.freeswitch.org/wiki/FreeSwitch_Dependencies, dependencies are downloaded and built *from upstream*, so thankfully the deps are pretty minimal.
-makedepends=('git' 'libjpeg' 'libedit' 'ldns' 'curl' 'python2' 'unixodbc' 'sed' 'make')
+makedepends=('git'
+             'libjpeg'
+             'ldns'
+             'libedit'
+             'curl'
+             'python2'
+             'unixodbc'
+             'sed'
+             'make')
 # per https://aur.archlinux.org/packages/freeswitch-fixed/ 2014-08-13 14:02 comment, enable this when freetdm is packaged.
 # freetdm will require libsangoma, wanpipe, libsng_isdn, libpri. see http://wiki.freeswitch.org/wiki/FreeTDM#Dependencies ; links below
 # http://wiki.sangoma.com/wanpipe-linux-drivers
 # http://downloads.asterisk.org/pub/telephony/libpri/releases
 #optdepends=('freetdm: FreeTDM support for DAHDI etc.') 
 provides=('freeswitch')
-conflicts=('freeswitch' 'freeswitch-fixed')
+conflicts=('freeswitch'
+           'freeswitch-fixed')
 install=freeswitch.install
-backup=('etc/freeswitch/private/passwords.xml' 'etc/freeswitch/vars.xml')
-source=('git+https://stash.freeswitch.org/scm/fs/freeswitch.git' 'freeswitch.conf.d' 'README.freeswitch' 'run.freeswitch' 'run_log.freeswitch' 'conf_log.freeswitch' 'freeswitch.service')
+backup=('etc/freeswitch/private/passwords.xml'
+        'etc/freeswitch/vars.xml')
+source=("git+https://stash.freeswitch.org/scm/fs/freeswitch.git"
+        'freeswitch.conf.d'
+         'README.freeswitch'
+         'run.freeswitch'
+         'run_log.freeswitch'
+         'conf_log.freeswitch'
+         'freeswitch.service')
 changelog='ChangeLog'
 _pkgname="freeswitch"
 
-## HAH. autoincrement.
 pkgver() {
   cd "${srcdir}/${_pkgname}"
   git describe --long | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'