summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAlon Ivtsan <alonivtsan@lavabit.com>2013-11-14 07:57:32 +0200
committerAlon Ivtsan <alonivtsan@lavabit.com>2013-11-14 07:57:32 +0200
commit08cd8a7141746bf9b3f3a31af93bdee36274195d (patch)
tree8b0e477584ff45d9a0b8683dcced09ffe99d44df /libre
parentc51a75a1803173eb014bfb390e23da4457613d77 (diff)
parentc865c99debc0473cb5a801fd9c151fa9e0a99401 (diff)
downloadabslibre-08cd8a7141746bf9b3f3a31af93bdee36274195d.tar.gz
abslibre-08cd8a7141746bf9b3f3a31af93bdee36274195d.tar.bz2
abslibre-08cd8a7141746bf9b3f3a31af93bdee36274195d.zip
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre')
-rw-r--r--libre/libretools/PKGBUILD16
-rw-r--r--libre/parabolaweb-utils/PKGBUILD11
2 files changed, 17 insertions, 10 deletions
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index a371f7733..569706f80 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -4,13 +4,13 @@
# Contributor: Márcio Silva <coadde@lavabit.com>
pkgbase=libretools
-pkgname=(libretools libretools-mips64el librelib libregit)
+pkgname=(libretools libretools-mips64el librelib gitget)
pkgdesc="Programs for Parabola development"
url="https://projects.parabolagnulinux.org/packages/libretools.git/"
license=('GPL3' 'GPL2')
-pkgver=20131027
-_libretools_commit=11ca293c188ad394e2383381a4bce152cc7f0723
+pkgver=20131112
+_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0
_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390
_packages_url=https://projects.parabolagnulinux.org/packages
@@ -45,11 +45,15 @@ package_librelib() {
make install-librelib DESTDIR="$pkgdir"
}
-package_libregit() {
+package_gitget() {
depends=("librelib=$pkgver" git)
+ provides=("libregit=$pkgver")
+ conflicts=("libregit")
+ replaces=("libregit")
+
cd "$srcdir/$pkgbase-$_libretools_commit"
- make install-libregit DESTDIR="$pkgdir"
+ make install-gitget DESTDIR="$pkgdir"
}
package_libretools() {
@@ -83,5 +87,5 @@ package_libretools-mips64el() {
make install-libretools-mips64el DESTDIR="$pkgdir"
}
-md5sums=('455f0ac438436b3580eb79dd9eb5a9e2'
+md5sums=('81e6d3d6fe1964a407a4520ce0916c0d'
'656008e8e35e6adba527b7bfc367b9f7')
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 0a49ce048..d210983ba 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,23 +1,26 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
pkgname=(parabolaweb-utils parabolaweb-dev)
-pkgver=20130717
+pkgver=20131112
pkgdesc="Utilities for managing the parabolaweb website application"
url="https://projects.parabolagnulinux.org/packages/parabolaweb-utils.git/"
license=('GPL2')
+# The commit to get dependency info for
+_parabolaweb_commit=c8eef42e8085e1e00af4031ec407b5e047194363
+
pkgrel=1
epoch=1
arch=('any')
source=(
"https://projects.parabolagnulinux.org/packages/$pkgname.git/snapshot/$pkgname-$pkgver.tar.bz2"
- "https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt"
+ "requirements_prod-${_parabolaweb_commit}.txt::https://projects.parabolagnulinux.org/parabolaweb.git/plain/requirements_prod.txt?id=${_parabolaweb_commit}"
)
build() {
cd "$srcdir/$pkgname-$pkgver"
- prod_file="file://${srcdir}/requirements_prod.txt" make
+ prod_file="file://${srcdir}/requirements_prod-${_parabolaweb_commit}.txt" make
}
package_parabolaweb-utils() {
@@ -33,5 +36,5 @@ package_parabolaweb-dev() {
depends=($(sed -r -e 's/\s*#.*//' depends_make.txt))
}
-md5sums=('a6734335001c7695d5a57fb509f8a745'
+md5sums=('5fef1c006f8155feb030e83ff66c2400'
'c84e52d81683cb3d572571ac19be89ac')