correct dependencies

4 files changed, 42 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index de2b31f92884..f2ec20ba97af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,23 @@
 pkgbase = gtg-git
-	pkgdesc = Personal GTD like organizer for the GNOME desktop environment. Git version.
-	pkgver = r5730.6623731f
+	pkgdesc = Getting Things GNOME! is a personal tasks and TODO-list items organizer for GNOME
+	pkgver = 0.4.r254.ge7130c6b
 	pkgrel = 1
 	url = https://wiki.gnome.org/Apps/GTG
-	install = gtg-git.install
 	arch = x86_64
 	license = GPL
+	checkdepends = python-nose
+	checkdepends = python-mock
 	makedepends = git
-	makedepends = python-gobject
 	makedepends = meson
-	depends = pygtk
-	depends = python-gobject
-	depends = python-configobj
-	depends = hicolor-icon-theme
-	depends = desktop-file-utils
-	depends = python2-gnomekeyring
-	depends = python-liblarch-git
-	depends = python-cairo
-	depends = python-pyxdg
+	depends = python-liblarch
 	depends = python-lxml
-	optdepends = pdftk: for Export and print plugin
-	optdepends = python-cheetah3: for Export and print plugin
-	optdepends = python2-libappindicator: for Notification area plugin (python-appindicator)
-	optdepends = texlive-bin: for Export and print plugin (for pdflatex)
-	optdepends = texlive-core: for Export and print plugin (for pdfjam)
-	source = gtg-git::git+https://github.com/getting-things-gnome/gtg
+	optdepends = python-cheetah3: for the Export and print plugin
+	optdepends = texlive-bin: pdflatex, for the Export and print plugin
+	optdepends = texlive-core: pdfjam, for the Export and print plugin
+	optdepends = pdftk: for the Export and print plugin
+	provides = gtg
+	conflicts = gtg
+	source = git+https://github.com/getting-things-gnome/gtg.git
 	sha256sums = SKIP
 
 pkgname = gtg-git
diff --git a/.gitignore b/.gitignore
index 8d4a7b3002a8..4dab8d6386e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
-src/*
-pkg/*
-gtg-git/*
+# Ignore everything
+*
 
-gtg-git-r*
\ No newline at end of file
+# But not these files...
+!.gitignore
+!PKGBUILD
+!.SRCINFO
diff --git a/PKGBUILD b/PKGBUILD
index 51ead797d694..c8ab9a9fea68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,41 @@
+# Maintainer: Mark Wagie <mark dot wagie at tutanota dot com>
 # Contributor: Baptiste Grenier <baptiste@bapt.name>
 # Contributor: Pablo Olmos de Aguilera Corradini <pablo <at] glatelier (dot} org>
-# Maintainer: Sander van Kasteel <info at sandervankasteel dot nl>
+# Contributor: Sander van Kasteel <info at sandervankasteel dot nl>
 pkgname=gtg-git
-pkgver=r5730.6623731f
+pkgver=0.4.r254.ge7130c6b
 pkgrel=1
-pkgdesc="Personal GTD like organizer for the GNOME desktop environment. Git version."
+pkgdesc="Getting Things GNOME! is a personal tasks and TODO-list items organizer for GNOME"
 url="https://wiki.gnome.org/Apps/GTG"
 arch=('x86_64')
 license=('GPL')
-depends=('pygtk' 'python-gobject' 'python-configobj'
-'hicolor-icon-theme' 'desktop-file-utils' 'python2-gnomekeyring'
-'python-liblarch-git' 'python-cairo' 'python-pyxdg' 'python-lxml')
-makedepends=('git' 'python-gobject' 'meson')
-optdepends=(
-'pdftk: for Export and print plugin'
-'python-cheetah3: for Export and print plugin'
-'python2-libappindicator: for Notification area plugin (python-appindicator)'
-'texlive-bin: for Export and print plugin (for pdflatex)'
-'texlive-core: for Export and print plugin (for pdfjam)'
-)
-install="${pkgname}.install"
-source=("${pkgname}::git+https://github.com/getting-things-gnome/gtg")
+depends=('python-liblarch' 'python-lxml')
+makedepends=('git' 'meson')
+optdepends=('python-cheetah3: for the Export and print plugin'
+            'texlive-bin: pdflatex, for the Export and print plugin'
+            'texlive-core: pdfjam, for the Export and print plugin'
+            'pdftk: for the Export and print plugin')
+checkdepends=('python-nose' 'python-mock')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=('git+https://github.com/getting-things-gnome/gtg.git')
+sha256sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${pkgname}"
-  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	cd "$srcdir/${pkgname%-git}"
+	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd "${srcdir}/${pkgname}"
-  arch-meson -Dprofile=development build
+	arch-meson "${pkgname%-git}" build
+	meson compile -C build
+}
 
-  ninja -C build
+check() {
+	cd "$srcdir/${pkgname%-git}"
+	python run-tests
 }
 
 package() {
-  cd "${srcdir}/${pkgname}"
-  DESTDIR="$pkgdir" ninja -C build install
-
-  install -d "${pkgdir}"/usr
+	DESTDIR="$pkgdir" meson install -C build
 }
-
-sha256sums=('SKIP')
diff --git a/gtg-git.install b/gtg-git.install
deleted file mode 100644
index c8b946fac68d..000000000000
--- a/gtg-git.install
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgname=gtg-git
-
-post_install() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-   post_install $1
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}