summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-30 12:48:58 -0300
committerAndré Fabian Silva Delgado <emulatorman@lavabit.com>2013-06-30 12:48:58 -0300
commit4df04e2ca29df8a3b8c095e15b94aee193095d5a (patch)
tree39f615ee5cbd5b6e59025787baa3192260312cbf
parent4206e14ab502da1c8dc607157f306adc0723a753 (diff)
parent7bd842afc221abb4613aa4eaaf319de6fb75ba96 (diff)
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r--libre/abs-libre/abs.install13
-rw-r--r--libre/abs/PKGBUILD (renamed from libre/abs-libre/PKGBUILD)33
2 files changed, 12 insertions, 34 deletions
diff --git a/libre/abs-libre/abs.install b/libre/abs-libre/abs.install
deleted file mode 100644
index ac814c2fc..000000000
--- a/libre/abs-libre/abs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-pre_upgrade() {
- if [ "$(vercmp $2 2.3.2-1)" -lt 0 ]; then
- echo "==> Fixing potential ABS tree permission issues (this may take a while...)"
-
- for dir in core extra community testing; do
- if [ -d /var/abs/$dir ]; then
- find /var/abs/$dir -type d -exec chown root:root {} \;
- find /var/abs/$dir -type d -exec chmod 755 {} \;
- fi
- done
- fi
-}
-
diff --git a/libre/abs-libre/PKGBUILD b/libre/abs/PKGBUILD
index 259cf007f..f7e85d0ef 100644
--- a/libre/abs-libre/PKGBUILD
+++ b/libre/abs/PKGBUILD
@@ -1,11 +1,12 @@
-# $Id: PKGBUILD 166402 2012-09-07 16:49:13Z dreisner $
+# $Id$
# Maintainer: Allan McRae <allan@archlinux.org>
-_pkgname=abs
-pkgname=abs-libre
-#CARCH=mips64el
+replaces=('abs-libre')
+conflicts=('abs-libre')
+
+pkgname=abs
pkgver=2.4.4
-pkgrel=1
+pkgrel=1.1
pkgdesc="Utilities to download and work with the Arch Build System (ABS)"
arch=('i686' 'x86_64' 'mips64el')
url="http://projects.archlinux.org/abs.git/"
@@ -15,18 +16,15 @@ backup=(etc/abs.conf)
source=(ftp://ftp.archlinux.org/other/abs/${pkgname}-${pkgver}.tar.gz{,.sig})
md5sums=('7258c739a93e02a4f31f114e9fc3b0ba'
'a628f7d5b1cd1e838366b88709690c24')
-provides=("${_pkgname}=${pkgver}")
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
build() {
- cd "$_pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make
}
package() {
- cd "$_pkgname-$pkgver"
+ cd "$pkgname-$pkgver"
make DESTDIR="${pkgdir}" install
@@ -34,18 +32,11 @@ package() {
install -dm755 "${pkgdir}"/var/abs/local/
install -Dm644 README "${pkgdir}"/var/abs/README
- sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' ${pkgdir}/etc/abs.conf
- sed -i -e 's|(core|(libre !libre-testing core|' ${pkgdir}/etc/abs.conf
-
# make adjustments to abs.conf
- if [[ $CARCH = "i686" ]]; then
+ sed -i -e 's|rsync.archlinux.org|parabolagnulinux.org|' "${pkgdir}"/etc/abs.conf
+ sed -i -e 's|(core|(libre !libre-testing core|' "${pkgdir}"/etc/abs.conf
+ if [[ $CARCH != "x86_64" ]]; then
sed -i -e 's| multilib||' -e 's| !multilib-testing||' "${pkgdir}"/etc/abs.conf
fi
- if [[ $CARCH = "x86_64" ]]; then
- sed -i '/ARCH=/s|i686|x86_64|' "${pkgdir}"/etc/abs.conf
- fi
- if [[ $CARCH = "mips64el" ]]; then
- sed -i -e 's| multilib||' -e 's| !multilib-testing||' ${pkgdir}/etc/abs.conf
- sed -i '/ARCH=/s|i686|mips64el|' ${pkgdir}/etc/abs.conf
- fi
+ sed -i "s/ARCH=.*/ARCH=$CARCH/" "${pkgdir}"/etc/abs.conf
}