summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Newgard2018-01-16 06:40:46 -0600
committerDoug Newgard2018-01-16 06:40:46 -0600
commit1c63f7d3cab8c5b281873f9a6cc7ca1846bb7777 (patch)
tree0d12bcf6eb50805fa8c298389132b1d1f25f1111
parent962d60870d224a6a4d2c088efeb7e2367820e5ab (diff)
downloadaur-1c63f7d3cab8c5b281873f9a6cc7ca1846bb7777.tar.gz
Revert all of albfan's commits
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD39
2 files changed, 32 insertions, 27 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f598cd8311c5..38ae12cbe004 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,22 @@
-# Generated by mksrcinfo v8
-# Mon Jan 15 20:52:12 UTC 2018
pkgbase = libgit2-git
pkgdesc = A linkable library for Git
- pkgver = 0.26.0
+ pkgver = 0.21.0.r65.g9b87998
pkgrel = 1
- epoch = 1
- url = https://libgit2.github.com/
+ epoch = 2
+ url = http://libgit2.github.com/
arch = i686
arch = x86_64
license = GPL2
- makedepends = git
makedepends = cmake
- makedepends = python
+ makedepends = python2
+ makedepends = git
depends = zlib
depends = openssl
depends = libssh2
- depends = curl
- replaces = libgit2
- source = git+https://github.com/libgit2/libgit2.git
- sha1sums = SKIP
+ provides = libgit2
+ conflicts = libgit2
+ source = git://github.com/libgit2/libgit2.git
+ md5sums = SKIP
pkgname = libgit2-git
diff --git a/PKGBUILD b/PKGBUILD
index a553e518e4fe..4eceb907748a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,39 @@
-# Maintainer: Alberto Fanjul <albertofanjul@gmail.com>
+# Maintainer: Daniel Micay <danielmicay@gmail.com>
+# Contributor: Dave Reisner <dreisner@archlinux.org>
+# Contributor: Hervé Cauwelier <herve ¤ oursours.net>
+_gitname=libgit2
pkgname=libgit2-git
-pkgver=0.26.0
+pkgver=0.21.0.r65.g9b87998
+epoch=2
pkgrel=1
-epoch=1
pkgdesc='A linkable library for Git'
arch=('i686' 'x86_64')
-url='https://libgit2.github.com/'
-depends=(zlib openssl libssh2 curl)
-makedepends=(git cmake python)
+url="http://libgit2.github.com/"
license=('GPL2')
-replaces=(libgit2)
-source=("git+https://github.com/libgit2/libgit2.git")
-sha1sums=('SKIP')
+depends=(zlib openssl libssh2)
+makedepends=(cmake python2 git)
+provides=('libgit2')
+conflicts=('libgit2')
+source=(git://github.com/libgit2/libgit2.git)
+md5sums=(SKIP)
+
+pkgver() {
+ cd $_gitname
+ git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/v//'
+}
build() {
- cd "$srcdir/libgit2"
- export LANG=en_US.UTF-8
- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DTHREADSAFE=ON
+ cd $_gitname
+ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr \
+ -DTHREADSAFE=ON -DPYTHON_EXECUTABLE=/usr/bin/python2
make
}
check() {
- cd "$srcdir/libgit2"
- make test
+ make -C $_gitname test
}
package() {
- cd "$srcdir/libgit2"
- make DESTDIR="$pkgdir" install
+ make -C $_gitname DESTDIR="$pkgdir" install
}