summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD31
2 files changed, 13 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dcd3bd32e65..3f03be36872 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = xournal-git
pkgdesc = Notetaking and sketching application
- pkgver = 20120913
+ pkgver = 0.4.7.12.gc722403
pkgrel = 1
url = http://sourceforge.net/projects/xournal/
install = xournal.install
@@ -20,6 +20,8 @@ pkgbase = xournal-git
conflicts = xournal
conflicts = xournal-image-patched
conflicts = xournalpp-svn
+ source = xournal::git+http://git.code.sf.net/p/xournal/code
+ sha1sums = SKIP
pkgname = xournal-git
diff --git a/PKGBUILD b/PKGBUILD
index eca43dc1bdf..79606e819fb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
# Maintainer: Florian Bruhin (The Compiler) <archlinux.org@the-compiler.org>
pkgname=xournal-git
-pkgver=20120913
+_gitname=xournal
+pkgver=0.4.7.12.gc722403
pkgrel=1
pkgdesc="Notetaking and sketching application"
arch=('i686' 'x86_64')
@@ -14,35 +15,23 @@ optdepends=('ghostscript: import PS/PDF files as bitmap backgrounds')
provides=('xournal')
conflicts=('xournal' 'xournal-image-patched' 'xournalpp-svn')
install=xournal.install
+source=('xournal::git+http://git.code.sf.net/p/xournal/code')
+sha1sums=('SKIP')
-_gitroot=git://xournal.git.sourceforge.net/gitroot/xournal/xournal
-_gitname=xournal
+pkgver() {
+ cd "$srcdir/$_gitname"
+ git describe --always | sed 's/^Release-//; s/[-_]/./g'
+}
build() {
- cd "$srcdir"
- msg "Connecting to GIT server...."
-
- if [[ -d "$_gitname" ]]; then
- cd "$_gitname" && git pull origin
- msg "The local files are updated."
- else
- git clone "$_gitroot" "$_gitname"
- fi
-
- msg "GIT checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_gitname-build"
- git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
- cd "$srcdir/$_gitname-build"
-
+ cd "$srcdir/$_gitname"
autoreconf -i
./configure --prefix=/usr
make
}
package() {
- cd "$srcdir/$_gitname-build"
+ cd "$srcdir/$_gitname"
make DESTDIR="${pkgdir}" install desktop-install
}