Small fix PKGBUILD

2 files changed, 39 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4877a8a13b22..44c57a0b2910 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,12 @@
 pkgbase = sat-libervia-hg
-	pkgver = 0.6.1.r1105.e6ff5530900e
+	pkgver = 0.6.1.r1108.7ec1ba86d38d
 	pkgrel = 1
 	url = http://salut-a-toi.org/
 	install = sat-libervia-hg.install
 	arch = any
 	license = AGPL3
 	makedepends = python2-setuptools
-	makedepends = python-virtualenv
+	makedepends = python2-virtualenv
 	makedepends = mercurial
 	depends = python2
 	depends = python2-txjsonrpc-git
@@ -18,20 +18,15 @@ pkgbase = sat-libervia-hg
 	depends = python2-zope-interface
 	depends = python2-pyopenssl
 	depends = python2-autobahn
+	depends = dbus
 	options = !strip
-	source = ftp://ftp.goffi.org/pyjamas/pyjamas.tar.bz2
-	source = hg+http://repos.goffi.org/libervia
+	source = https://ftp.goffi.org/pyjamas/pyjamas.tar.bz2
+	source = hg+https://repos.goffi.org/libervia
 	md5sums = a0d6344951153f79302eb2b6fd08376e
 	md5sums = SKIP
 
 pkgname = sat-libervia-hg
 	pkgdesc = Salut à Toi, multi-frontends multi-purposes XMPP client (Web interface)
-	depends = dbus
 	provides = sat-libervia
 	conflicts = sat-libervia
 
-pkgname = sat-pyjamas
-	pkgdesc = Pyjamas is a toolkit and applications framework, for the Web.
-	provides = sat-pyjamas
-	conflicts = sat-pyjamas
-
diff --git a/PKGBUILD b/PKGBUILD
index 7b50759d90af..c78ca3d0a6bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@ pkgname='sat-libervia-hg'
 _realname=libervia
 _pyjamasname=pyjamas
 venv_pyjama='venv'
-pkgver=0.6.1.r1107.2066d4fd9036
-VERSION=0.6.1
+pkgver=0.6.1.r1108.7ec1ba86d38d
+_version=0.6.1
 pkgrel=1
 url="http://salut-a-toi.org/"
 arch=('any')
@@ -24,50 +24,45 @@ md5sums=('a0d6344951153f79302eb2b6fd08376e'
 options=('!strip')
 
 pkgver() {
-        cd "$_realname"
-        printf "$VERSION.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
+    cd "$_realname"
+    printf "$_version.r%s.%s" "$(hg identify -n)" "$(hg identify -i)"
 }
 
 pyjamas_build(){
- 	virtualenv $venv_pyjama -ppython2.7 --system-site-packages
-	cd $_pyjamasname
-	source $srcdir/$venv_pyjama/bin/activate
-	python2.7 bootstrap.py
-	deactivate
+    virtualenv $venv_pyjama -ppython2.7 --system-site-packages
+    cd $_pyjamasname
+    source $srcdir/$venv_pyjama/bin/activate
+    python2.7 bootstrap.py
+    deactivate
 }
 
 build() {
-        pyjamas_build
-        cd "$srcdir/$_realname"
-        PYJSBUILD_PATH="$srcdir/pyjamas/bin/"
-        PATH=$PATH:$PYJSBUILD_PATH LIBERVIA_INSTALL=arch NO_PREINSTALL_OPT=nopreinstall SAT_INSTALL=nopreinstall python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
-	cp -r $srcdir/$_realname/src/{browser,pages,common,server,twisted} $srcdir/fakeinstall/usr/lib/python2.7/site-packages/libervia
+    pyjamas_build
+    cd "$srcdir/$_realname"
+    PYJSBUILD_PATH="$srcdir/pyjamas/bin/"
+    PATH=$PATH:$PYJSBUILD_PATH LIBERVIA_INSTALL=arch NO_PREINSTALL_OPT=nopreinstall SAT_INSTALL=nopreinstall python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
+    cp -r $srcdir/$_realname/src/{browser,pages,common,server,twisted} $srcdir/fakeinstall/usr/lib/python2.7/site-packages/libervia
 }
 
 package(){
-        pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (Web interface)"
-        provides=('sat-libervia')
-        conflicts=('sat-libervia')
-	cd "$pkgdir"
-	install -dm755 usr/bin
-	install -dm755 usr/lib/python2.7/site-packages
-	install -dm755 usr/share/doc
-	install -dm755 usr/share/libervia
-	install -dm755 usr/lib/python2.7/site-packages/twisted/plugins
-	# HTML destination
-	install -dm755 usr/share/libervia/html
-	cd "$srcdir/fakeinstall"
-        cp "$srcdir/libervia/src/libervia.sh" "$pkgdir/usr/bin/libervia"
-	mv -v usr/share/doc/libervia "$pkgdir/usr/share/doc/"
-        mv -v usr/share/libervia "$pkgdir/usr/share/libervia/"
-	mv -v usr/lib/python2.7/site-packages/libervia "$pkgdir/usr/lib/python2.7/site-packages/"
-	mv -v usr/lib/python2.7/site-packages/libervia-0.6.1.1-py2.7.egg-info "$pkgdir/usr/lib/python2.7/site-packages/"
-	mv -v usr/lib/python2.7/site-packages/twisted/plugins/* "$pkgdir/usr/lib/python2.7/site-packages/twisted/plugins/"
-	mv -v "$srcdir/libervia/html" "$pkgdir/usr/share/libervia/"
-	mv -v "$srcdir/libervia/themes" "$pkgdir/usr/share/libervia"
+    pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (Web interface)"
+    provides=('sat-libervia')
+    conflicts=('sat-libervia')
+    cd "$pkgdir"
+    install -dm755 usr/bin
+    install -dm755 usr/lib/python2.7/site-packages
+    install -dm755 usr/share/doc
+    install -dm755 usr/share/libervia
+    install -dm755 usr/lib/python2.7/site-packages/twisted/plugins
+    # HTML destination
+    install -dm755 usr/share/libervia/html
+    cd "$srcdir/fakeinstall"
+    cp "$srcdir/libervia/src/libervia.sh" "$pkgdir/usr/bin/libervia"
+    mv -v usr/share/doc/libervia "$pkgdir/usr/share/doc/"
+    mv -v usr/share/libervia "$pkgdir/usr/share/libervia/"
+    mv -v usr/lib/python2.7/site-packages/libervia "$pkgdir/usr/lib/python2.7/site-packages/"
+    mv -v usr/lib/python2.7/site-packages/libervia-0.6.1.1-py2.7.egg-info "$pkgdir/usr/lib/python2.7/site-packages/"
+    mv -v usr/lib/python2.7/site-packages/twisted/plugins/* "$pkgdir/usr/lib/python2.7/site-packages/twisted/plugins/"
+    mv -v "$srcdir/libervia/html" "$pkgdir/usr/share/libervia/"
+    mv -v "$srcdir/libervia/themes" "$pkgdir/usr/share/libervia"
  }
-
-
-
-
-