Version bump

3 files changed, 34 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2246df1ad94c..c19c38a8267d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,27 @@
 pkgbase = corebird-git
 	pkgdesc = Native Gtk+ Twitter Client
-	pkgver = 3405+g80ca816
+	pkgver = 1.6.r58.gde21b6a9
 	pkgrel = 1
-	url = https://github.com/baedert/corebird
-	install = corebird.install
+	epoch = 1
+	url = https://corebird.baedert.org/
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = vala>=0.26
+	makedepends = vala
 	makedepends = git
 	makedepends = automake
-	depends = gtk3>=3.14
-	depends = glib2>=2.40
-	depends = rest>=0.7
+	depends = gtk3
+	depends = rest
 	depends = libgee
 	depends = sqlite3
-	depends = libsoup>=2.4
-	depends = json-glib
 	depends = intltool
-	depends = gstreamer
 	depends = gst-plugins-good
 	depends = gst-plugins-bad
 	depends = gst-libav
-	source = git+https://github.com/baedert/corebird
+	depends = gspell
+	provides = corebird
+	conflicts = corebird
+	source = corebird-git::git+https://github.com/baedert/corebird
 	sha1sums = SKIP
 
 pkgname = corebird-git
diff --git a/PKGBUILD b/PKGBUILD
index db33427d2026..2bf75d55a857 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,42 @@
+# Maintainer: Fabio Loli <loli_fabio@protonmail.com>
+# Contributor: Baedert
+
 pkgname=corebird-git
-pkgver=3405+g80ca816
+epoch=1
+pkgver=1.6.r58.gde21b6a9
 pkgrel=1
-_realver=1.0.1
 pkgdesc="Native Gtk+ Twitter Client"
 arch=('i686' 'x86_64')
 license=('GPL')
-url="https://github.com/baedert/corebird"
-depends=('gtk3>=3.14'
-     'glib2>=2.40'
-     'rest>=0.7'
-     'libgee'
-     'sqlite3'
-     'libsoup>=2.4'
-     'json-glib'
-     'intltool'
-     'gstreamer'
-     'gst-plugins-good'
-     'gst-plugins-bad'
-     'gst-libav')
-makedepends=('vala>=0.26' 'git' 'automake')
-source=(git+https://github.com/baedert/corebird)
-sha1sums=(SKIP)
-install=corebird.install
+url="https://corebird.baedert.org/"
+depends=('gtk3'
+         'rest'
+         'libgee'
+         'sqlite3'
+         'intltool'
+         'gst-plugins-good'
+         'gst-plugins-bad'
+         'gst-libav'
+         'gspell')
+makedepends=('vala' 'git' 'automake')
+provides=('corebird')
+conflicts=('corebird')
+source=("${pkgname}::git+https://github.com/baedert/corebird")
+sha1sums=('SKIP')
 
 pkgver() {
-  cd corebird
-  echo $(git rev-list --count HEAD)+g$(git rev-parse --short HEAD)
+  cd ${pkgname}
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  cd corebird
+  cd ${pkgname}
   # Add --disable-video here if you don't like the gstreamer deps
   ./autogen.sh --prefix=/usr
   make
 }
 
 package() {
-  cd corebird
+  cd ${pkgname}
   make DESTDIR=$pkgdir install
 }
diff --git a/corebird.install b/corebird.install
deleted file mode 100644
index 4b90c879eba0..000000000000
--- a/corebird.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}