Use upstream installation (thanks user klemens)

2 files changed, 4 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 427169730a21..8510bb13e8a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jun  3 20:22:12 UTC 2018
+# Mon Jun 11 07:53:07 UTC 2018
 pkgbase = fdroidserver
 	pkgdesc = F-Droid repository management tools
 	pkgver = 1.0.6
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 2
 	url = https://gitlab.com/fdroid/fdroidserver
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 9a0f79938080..945711cf1e1b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=fdroidserver
 pkgver=1.0.6
 epoch=2
-pkgrel=1
+pkgrel=2
 pkgdesc="F-Droid repository management tools"
 url="https://gitlab.com/fdroid/$pkgname"
 license=('GPL3')
@@ -41,8 +41,7 @@ package() {
 
     python setup.py compile_catalog
     python setup.py bdist_egg
-    python setup.py install --root="$pkgdir/" --optimize=1 --install-data="/tmp"
-    # rm -rf "$pkgdir/tmp"
+    python setup.py install --root="$pkgdir/" --optimize=1 --install-data="/usr"
 
     mkdir -p "$pkgdir/usr/bin"
     install "fdroid" "$pkgdir/usr/bin"
@@ -50,7 +49,5 @@ package() {
 
     install -D completion/bash-completion "$pkgdir/usr/share/bash-completion/completions/fdroidserver"
 
-    install -D "examples/config.py" "$pkgdir/usr/share/doc/$pkgname/examples/config.py"
-    install -D "examples/fdroid-icon.png" "$pkgdir/usr/share/doc/$pkgname/examples/fdroid-icon.png"
     mkdir -p "$pkgdir/opt/android-sdk/tools"
 }