Update sat pkackage to take into account upstream modifications. One package provides sat, jp and primitivus.

2 files changed, 8 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 51ff7667b0e7..70651abec1b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = sat-xmpp-hg
-	pkgver = 0.7.0.r2534.7da86e1633a5
+	pkgver = 0.7.0.r2577.1209a5d83082
 	pkgrel = 1
 	url = http://salut-a-toi.org/
 	arch = any
@@ -36,19 +36,10 @@ pkgname = sat-xmpp-hg
 	depends = sat-tmp
 	depends = python2-dateutil
 	depends = python2-regex
-
-pkgname = sat-jp-hg
-	pkgdesc = Salut à Toi, multi-frontends multi-purposes XMPP client (CLI frontend)
-	depends = sat-xmpp-hg
 	depends = python2-gobject
 	depends = python2-progressbar
 	depends = python2-pyinotify
 	depends = python2-babel
-
-pkgname = sat-primitivus-hg
-	pkgdesc = Salut à Toi, multi-frontends multi-purposes XMPP client (console frontend)
-	depends = sat-xmpp-hg
-	depends = python2-gobject
 	depends = python2-urwid>=1.2.0
 	depends = python2-urwid-satext>=0.6.1
 	depends = python2-xlib
diff --git a/PKGBUILD b/PKGBUILD
index e730aef95c76..32ae07b5842f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
 
 pkgbase='sat-xmpp-hg'
-pkgname=('sat-xmpp-hg' 'sat-jp-hg' 'sat-primitivus-hg')
+pkgname=('sat-xmpp-hg')
 _realname=sat
-pkgver=0.7.0.r2534.7da86e1633a5
+pkgver=0.7.0.r2577.1209a5d83082
 VERSION=0.7.0
 pkgrel=1
 url="http://salut-a-toi.org/"
@@ -28,14 +28,13 @@ build() {
     python2 setup.py build
                          
     install -dm755 "$srcdir/fakeinstall/"
-    SAT_INSTALL=nopreinstall python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
+    python2 setup.py install --root="$srcdir/fakeinstall/" --prefix=/usr --optimize=1
 }
 
-package_sat-xmpp-hg(){
+package(){
     pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (core)"
     depends=('dbus' 'python2-lxml>=3.1.0' 'python2-pillow' 'python2-pycryptodomex>=2.6.1' 'python2-pyopenssl' 'python2-dbus' 'python2-potr' 'python2-twisted' 
-'python2-wokkel>=0.7.1' 'python-xdg' 'python2-zope-interface' 'mutagen' 'python2-markdown' 'python2-xdg' 'python2-shortuuid-git' ' python2-gobject2' 'python2-html2text' 'python2-netifaces' 'python2-miniupnpc' 
-'python2-service-identity' 'sat-tmp' 'python2-dateutil' 'python2-regex')
+'python2-wokkel>=0.7.1' 'python-xdg' 'python2-zope-interface' 'mutagen' 'python2-markdown' 'python2-xdg' 'python2-shortuuid-git' 'python2-gobject2' 'python2-html2text' 'python2-netifaces' 'python2-miniupnpc' 'python2-service-identity' 'sat-tmp' 'python2-dateutil' 'python2-regex' 'python2-gobject' 'python2-progressbar' 'python2-pyinotify' 'python2-babel' 'python2-urwid>=1.2.0' 'python2-urwid-satext>=0.6.1' 'python2-xlib')
 
      cd "$pkgdir"
      install -dm755 usr/bin/
@@ -43,40 +42,11 @@ package_sat-xmpp-hg(){
      install -dm755 usr/lib/python2.7/site-packages/sat_frontends
                                  
      cd "$srcdir/fakeinstall"
-     mv -v usr/bin/sat "$pkgdir/usr/bin/"
+     mv -v usr/bin/* "$pkgdir/usr/bin/"
      mv -v usr/share/ "$pkgdir/usr/"
-     mv -v usr/lib/python2.7/site-packages/sat/ "$pkgdir/usr/lib/python2.7/site-packages/"
+     mv -v usr/lib/python2.7/site-packages/{sat-*,sat_frontends,sat} "$pkgdir/usr/lib/python2.7/site-packages/"
      mv -v usr/lib/python2.7/site-packages/twisted/ "$pkgdir/usr/lib/python2.7/site-packages/"
-#     mv -v usr/lib/python2.7/site-packages/$_realname-py2.7.egg-info/ "$pkgdir/usr/lib/python2.7/site-packages/"
-     for i in bridge __init__.py* quick_frontend tools; do
-     mv -v "usr/lib/python2.7/site-packages/sat_frontends"/$i "$pkgdir/usr/lib/python2.7/site-packages/sat_frontends/"
-     done
  }
 
-package_sat-jp-hg(){
-    pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (CLI frontend)"
-    depends=('sat-xmpp-hg' 'python2-gobject' 'python2-progressbar' 'python2-pyinotify' 'python2-babel')
-
-    cd "$pkgdir"
-    install -dm755 usr/bin/
-    install -dm755 usr/lib/python2.7/site-packages/sat_frontends/
-                                                                  
-    cd "$srcdir/fakeinstall"
-    mv -v usr/bin/jp "$pkgdir/usr/bin/"
-    mv -v usr/lib/python2.7/site-packages/sat_frontends/jp/ "$pkgdir/usr/lib/python2.7/site-packages/sat_frontends/"
-}
-
-package_sat-primitivus-hg(){
-    pkgdesc="Salut à Toi, multi-frontends multi-purposes XMPP client (console frontend)"
-    depends=('sat-xmpp-hg' 'python2-gobject' 'python2-urwid>=1.2.0' 'python2-urwid-satext>=0.6.1' 'python2-xlib')
-
-    cd "$pkgdir"
-    install -dm755 usr/bin/
-    install -dm755 usr/lib/python2.7/site-packages/sat_frontends/
-                                                                         
-    cd "$srcdir/fakeinstall"
-    mv -v usr/bin/primitivus "$pkgdir/usr/bin/"
-    mv -v usr/lib/python2.7/site-packages/sat_frontends/primitivus/ "$pkgdir/usr/lib/python2.7/site-packages/sat_frontends/"
-}