Update for makepkg bzr support

3 files changed, 18 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3c6d7b5989d5..7f5633dc4c79 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
 pkgbase = lottanzb-bzr
 	pkgdesc = A SABnzbd+ (Usenet binary downloader) GUI front-end written in PyGTK (bzr version)
-	pkgver = 1732
+	pkgver = r1740
 	pkgrel = 1
 	url = http://www.lottanzb.org/
-	install = lottanzb-bzr.install
 	arch = any
 	license = GPL
 	makedepends = intltool
 	makedepends = bzr
+	makedepends = python-dulwich
+	makedepends = python2-setuptools
 	depends = python2-dbus
 	depends = python2-configobj
 	depends = pygtk
 	depends = hicolor-icon-theme
-	depends = desktop-file-utils
 	optdepends = sabnzbd: for local downloading
 	optdepends = par2cmdline: for checking and repairing downloads
 	optdepends = pyopenssl: for SSL encryption and HTTPS remote access
@@ -24,6 +24,8 @@ pkgbase = lottanzb-bzr
 	optdepends = intltool: for translation support
 	provides = lottanzb
 	conflicts = lottanzb
+	source = bzr+lp:lottanzb
+	sha256sums = SKIP
 
 pkgname = lottanzb-bzr
 
diff --git a/PKGBUILD b/PKGBUILD
index aacbd490221f..4d7cc3b2043d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,17 @@
-# Maintainer: Lari Tikkanen <lartza at wippies.com>
+# Maintainer: Lari Tikkanen <lartza at outlook.com>
 # Contributor: Samed Beyribey <ras0ir AT eventualis DOT org>
 # Contributor: Nelson VuDu <vudu DOT curse AT gmail DOT com>
 
 pkgname=lottanzb-bzr
-pkgver=1732
+_pkgname=lottanzb
+pkgver=r1740
 pkgrel=1
 pkgdesc="A SABnzbd+ (Usenet binary downloader) GUI front-end written in PyGTK (bzr version)"
 arch=('any')
 url="http://www.lottanzb.org/"
 license=('GPL')
-depends=('python2-dbus' 'python2-configobj' 'pygtk' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('intltool' 'bzr')
+depends=('python2-dbus' 'python2-configobj' 'pygtk' 'hicolor-icon-theme')
+makedepends=('intltool' 'bzr' 'python-dulwich' 'python2-setuptools')
 optdepends=('sabnzbd: for local downloading'
 	    'par2cmdline: for checking and repairing downloads'
             'pyopenssl: for SSL encryption and HTTPS remote access'
@@ -22,31 +23,20 @@ optdepends=('sabnzbd: for local downloading'
 	    'intltool: for translation support')
 provides=('lottanzb')
 conflicts=('lottanzb')
-install=${pkgname}.install
+source=(bzr+lp:lottanzb)
+sha256sums=('SKIP')
 
-_bzrmod=trunk
-_bzrbranch=lp:lottanzb/${_bzrmod} 
+pkgver() {
+  cd "${_pkgname}"
+  printf "r%s" "$(bzr revno)"
+}
 
 build() {
-  cd ${srcdir}
-
-  if [ -d ${_bzrmod}/.bzr ]; then
-    (cd ${_bzrmod} && bzr pull -r ${pkgver})
-  else
-    bzr branch ${_bzrbranch} ${_bzrmod}
-  fi
-
-  msg "BZR checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "${srcdir}/${_bzrmod}-build"
-  cp -r "${srcdir}/${_bzrmod}" "${srcdir}/${_bzrmod}-build"
-  cd "${srcdir}/${_bzrmod}-build"
-
+  cd "${_pkgname}"
   python2 setup.py build
 }
 
 package() {
-  cd ${srcdir}/${_bzrmod}-build
+  cd "${_pkgname}"
   python2 setup.py install --packaging-mode --root=${pkgdir} --prefix=/usr 
 }
diff --git a/lottanzb-bzr.install b/lottanzb-bzr.install
deleted file mode 100644
index ac5fb979bb71..000000000000
--- a/lottanzb-bzr.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
-  update-mime-database usr/share/mime >/dev/null
-  update-desktop-database -q >/dev/null
-  gtk-update-icon-cache -q -f -t /usr/share/icons/gnome >/dev/null
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor >/dev/null
-  niceinfo
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  update-mime-database usr/share/mime >/dev/null
-  update-desktop-database -q >/dev/null
-  gtk-update-icon-cache -q -f -t /usr/share/icons/gnome >/dev/null
-  gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor >/dev/null
-}
-
-op=$1
-shift
-
-$op $*