PKGBUILD: Moving setuptools build to build(). Renaming source tar so its name won't clash. Only doing setuptools install in package(). nextcloud-news-updater.install: Only leaving the note about timer unit correlation with testrun setting in configuration.

3 files changed, 19 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 721b886e8af7..460907afe592 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 # Generated by mksrcinfo v8
-# Tue Oct 17 09:46:16 UTC 2017
+# Tue Oct 24 22:51:19 UTC 2017
 pkgbase = nextcloud-news-updater
-	pkgdesc = This Python library is a parllel feed updater for the nextCloud News app
+	pkgdesc = This Python library is a parallel feed updater for the nextCloud News app
 	pkgver = 10.0.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/nextcloud/news-updater
 	install = nextcloud-news-updater.install
 	arch = any
 	license = GPL3
 	depends = python-setuptools
 	optdepends = nextcloud-app-news: Updating a local instance of the nextCloud News app
-	conflicts = owncloud-news-updater
 	options = !strip
 	backup = etc/webapps/nextcloud/news/nextcloud-news-updater.ini
-	source = https://github.com/nextcloud/news-updater/archive/10.0.0.tar.gz
+	source = nextcloud-news-updater.tar.gz::https://github.com/nextcloud/news-updater/archive/10.0.0.tar.gz
 	source = nextcloud-news-updater.ini
 	source = nextcloud-news-updater.service
 	source = nextcloud-news-updater.timer
diff --git a/PKGBUILD b/PKGBUILD
index 98176fc4701e..c99386b9f9f6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,8 @@
 
 pkgname=nextcloud-news-updater
 pkgver=10.0.0
-pkgrel=1
-pkgdesc="This Python library is a parllel feed updater for the nextCloud News app"
+pkgrel=2
+pkgdesc="This Python library is a parallel feed updater for the nextCloud News app"
 arch=('any')
 url="https://github.com/nextcloud/news-updater"
 license=('GPL3')
@@ -13,8 +13,7 @@ depends=('python-setuptools')
 optdepends=('nextcloud-app-news: Updating a local instance of the nextCloud News app')
 backup=("etc/webapps/nextcloud/news/${pkgname}.ini")
 options=('!strip')
-conflicts=('owncloud-news-updater')
-source=("https://github.com/nextcloud/news-updater/archive/${pkgver}.tar.gz"
+source=("${pkgname}.tar.gz::https://github.com/nextcloud/news-updater/archive/${pkgver}.tar.gz"
   "${pkgname}.ini"
   "${pkgname}.service"
   "${pkgname}.timer")
@@ -24,11 +23,16 @@ sha512sums=('de67edebe05606f044f73d93a48b67251182f80175c7ce1e40d62d9835ba05928d5
             'dd06c06249bc9537555517d97a66dbaefcfcc27547a03abb3cf8bcb15edbda1f49cb03191dbebb8ad6737bdf46c1f25567636fa1c206b60a39d22ce41c506aaa')
 install=${pkgname}.install
 
+build() {
+  cd "news-updater-${pkgver}"
+  python setup.py build
+}
+
 package() {
-  cd $srcdir/news-updater-$pkgver/
-  install -d $pkgdir/etc/webapps/nextcloud/news
-  install -Dm0644 ${srcdir}/${pkgname}.ini $pkgdir/etc/webapps/nextcloud/news/${pkgname}.ini
-  install -Dm0644 ${srcdir}/${pkgname}.service $pkgdir/usr/lib/systemd/system/${pkgname}.service
-  install -Dm0644 ${srcdir}/${pkgname}.timer $pkgdir/usr/lib/systemd/system/${pkgname}.timer
-  python3 setup.py install --root=$pkgdir
+  cd "news-updater-${pkgver}"
+  python setup.py install --skip-build --optimize=1 --root="${pkgdir}"
+  install -d "${pkgdir}"/etc/webapps/nextcloud/news
+  install -Dm0644 "${srcdir}/${pkgname}.ini" "${pkgdir}/etc/webapps/nextcloud/news/${pkgname}.ini"
+  install -Dm0644 "${srcdir}/${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service"
+  install -Dm0644 "${srcdir}/${pkgname}.timer" "${pkgdir}/usr/lib/systemd/system/${pkgname}.timer"
 }
diff --git a/nextcloud-news-updater.install b/nextcloud-news-updater.install
index b4c502ee86d4..fae24a542ecf 100644
--- a/nextcloud-news-updater.install
+++ b/nextcloud-news-updater.install
@@ -1,15 +1,4 @@
 post_install() {
-  echo "Please edit your config in /etc/webapps/nextcloud/news/nextcloud-news-updater.ini"
-  echo "Follow instructions on how to setup your Nextcloud instance here: https://github.com/nextcloud/news-updater"
-  echo "To enable/ start the service, run:"
-  echo "    systemctl enable nextcloud-news-updater.service"
-  echo "    systemctl start nextcloud-news-updater.service"
-  echo "Reload after configuration changes:"
-  echo "    systemctl restart nextcloud-news-updater.service"
-  echo ""
-  echo "Note: Only use the nextcloud-news-updater.timer, if you have set testrun=true in your config!"
-  echo "To then enable/start it, run:"
-  echo "    systemctl enable nextcloud-news-updater.timer"
-  echo "    systemctl start nextcloud-news-updater.timer"
+  echo "Note: Only use the nextcloud-news-updater.timer, if you have set testrun=true in your configuration!"
 }