Create stable package

5 files changed, 53 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 64324042f28c..d345ea8230a5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,20 @@
-pkgbase = nvpy-git
-	pkgdesc = Simplenote syncing note-taking application, inspired by Notational Velocity and ResophNotes, but uglier and cross-platformerer.
-	pkgver = r430.d1c926c
-	pkgrel = 2
+pkgbase = nvpy
+	pkgdesc = Simplenote syncing note-taking application, but uglier and cross-platformerer.
+	pkgver = 2.1.0
+	pkgrel = 1
 	url = https://github.com/cpbotha/nvpy
+	install = nvpy.install
 	arch = any
 	license = BSD
-	makedepends = git
-	makedepends = python2
-	depends = python2-docutils
-	depends = python2-markdown
-	depends = python2-setuptools
+	depends = python
+	depends = python-docutils
+	depends = python-markdown
+	depends = python-setuptools
+	depends = python-simplenote
 	depends = tk
-	provides = nvpy
-	conflicts = nvpy
-	source = nvpy::git+https://github.com/cpbotha/nvpy.git
-	source = nvpy.desktop
-	md5sums = SKIP
-	md5sums = 3af5dfdda04db2262c7dfab9c0c4c681
+	provides = nvpy-git
+	source = https://github.com/cpbotha/nvpy/archive/v2.1.0.tar.gz
+	sha256sums = fd045f90660134154474318f7155b2fa0a439c7b00da85800d7d75c4650666e2
 
-pkgname = nvpy-git
+pkgname = nvpy
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..798c60da1f52
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+*/**
diff --git a/PKGBUILD b/PKGBUILD
index 433dae0091f7..e758c0d59e31 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,43 @@
-# Maintainer: Tomas Kral <tomas.kral@gmail.com>
-pkgname=nvpy-git
-pkgver=r430.d1c926c
-pkgrel=2
-pkgdesc="Simplenote syncing note-taking application, inspired by Notational Velocity and ResophNotes, but uglier and cross-platformerer."
+# Maintainer: Joost Bremmer <contact@madeofmagicandwires.online>
+# Contributor: Tomas Kral <tomas.kral@gmail.com>
+pkgname=nvpy
+pkgver=2.1.0
+pkgrel=1
+pkgdesc="Simplenote syncing note-taking application, but uglier and cross-platformerer."
 arch=("any")
 url="https://github.com/cpbotha/nvpy"
 license=("BSD")
-depends=("python2-docutils" "python2-markdown" "python2-setuptools" "tk")
-makedepends=("git" "python2")
-provides=("${pkgname%-*}")
-conflicts=("${pkgname%-*}")
-source=("nvpy::git+https://github.com/cpbotha/nvpy.git" "nvpy.desktop")
-md5sums=("SKIP" "3af5dfdda04db2262c7dfab9c0c4c681")
-
-pkgver() {
-	cd "$srcdir/${pkgname%-git}"
-	printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+depends=(
+  "python"
+  "python-docutils"
+  "python-markdown"
+  "python-setuptools"
+  "python-simplenote"
+  "tk"
+)
+provides=("$pkgname")
+provides=("${pkgname}-git")
+source=("https://github.com/cpbotha/${pkgname}/archive/v${pkgver}.tar.gz")
+install=nvpy.install
+sha256sums=('fd045f90660134154474318f7155b2fa0a439c7b00da85800d7d75c4650666e2')
 
 build() {
-	cd "$srcdir/${pkgname%-git}"
+  cd "$srcdir/${pkgname}-${pkgver}"
+  python ./setup.py build
 }
 
 package() {
-    cd "$srcdir/${pkgname%-git}"
-    python2 setup.py install --root="$pkgdir/" --optimize=1
-    install -Dm644 "$srcdir"/nvpy.desktop "${pkgdir}"/usr/share/applications/nvpy.desktop
+  cd "$srcdir/${pkgname}-${pkgver}"
+  python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+
+  # install example config to /usr/share
+  install -Dvm644 "${pkgname}/${pkgname}-example.cfg" \
+    "${pkgdir}/usr/share/${pkgname}/${pkgname}.cfg"
+
+  # add license
+  mkdir -p  $pkgdir/usr/share/licenses/$pkgname
+  cp LICENSE.txt  $pkgdir/usr/share/licenses/$pkgname/LICENSE
 
-    mkdir -p  $pkgdir/usr/share/licenses/$pkgname
-    cp LICENSE.txt  $pkgdir/usr/share/licenses/$pkgname/LICENSE
 }
+
+# vim: set ts=2 sts=2 sw=2 et :
diff --git a/nvpy.desktop b/nvpy.desktop
deleted file mode 100644
index 6e5776d77f0c..000000000000
--- a/nvpy.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=nvPY
-Comment=Cross-platform simplenote-syncing note-taking tool
-Exec=nvpy
-Icon=/usr/lib/python2.7/site-packages/nvpy/icons/nvpy.gif
-Categories=Utility;
-Terminal=false
-StartupNotify=true
-StartupWMClass=nvPY
-
diff --git a/nvpy.install b/nvpy.install
new file mode 100644
index 000000000000..5fd6b194f71a
--- /dev/null
+++ b/nvpy.install
@@ -0,0 +1,5 @@
+post_install() {
+    echo "Be sure to create a config file containing your login credentials
+    at: '~/.nvpy.cfg'"
+    echo "Example config provided at '/usr/share/nvpy/nvpy.cfg'"
+}