diff options
author | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-07-23 05:03:51 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <emulatorman@lavabit.com> | 2013-07-23 05:03:51 -0300 |
commit | bc934ac09b7e1896f7083ed9be8697b44e17f6e5 (patch) | |
tree | a60d6fb420867be89112ad8043629ebbf8786b42 | |
parent | 08251af6f167ec35b8c2e4039ed090fad493a23e (diff) | |
parent | 8491f6ded87cb9e7c5bfe81e51077ae77dbb9476 (diff) | |
download | abslibre-bc934ac09b7e1896f7083ed9be8697b44e17f6e5.tar.gz abslibre-bc934ac09b7e1896f7083ed9be8697b44e17f6e5.tar.bz2 abslibre-bc934ac09b7e1896f7083ed9be8697b44e17f6e5.zip |
Merge branch 'master' of ssh://projects.parabolagnulinux.org:1863/srv/git/abslibre
-rw-r--r-- | pcr/command-not-found/PKGBUILD | 47 | ||||
-rw-r--r-- | pcr/command-not-found/install | 3 | ||||
-rw-r--r-- | pcr/etckeeper/PKGBUILD | 33 |
3 files changed, 33 insertions, 50 deletions
diff --git a/pcr/command-not-found/PKGBUILD b/pcr/command-not-found/PKGBUILD index d43b73c0e..e2131a3d5 100644 --- a/pcr/command-not-found/PKGBUILD +++ b/pcr/command-not-found/PKGBUILD @@ -1,47 +1,32 @@ +# Maintainer: Aurelien Desbrieres <aurelien@cwb.io> +# Contributor: Diogo Leal <estranho@diogoleal.com> +# Contributor: Luke Shumaker <lukeshu@sbcglobal.net> # Contributor: Matthias Maennich <arch@maennich.net> -# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io> pkgname=command-not-found -pkgver=0.4.4 +pkgver=0.4.5 pkgrel=1 pkgdesc="In case a command could not be found this utility searches for packages containing this or a similar command (bash,zsh)." arch=('i686' 'x86_64') url="http://github.com/metti/command-not-found" -license=('GPL') +license=('GPL3') depends=('boost-libs' 'tdb' 'libarchive' 'wget') -makedepends=('boost' 'tdb' 'cmake' 'git') -source=('install') -md5sums=('2ea3c216fb0b7f8449f0225ece33210c') +makedepends=('boost' 'cmake') install='install' -_gitrepo="https://github.com/metti/$pkgname.git" +source=("libre://$pkgname-$pkgver.tar.gz") +mksource=("$pkgname-$pkgver::git+https://github.com/metti/$pkgname.git#tag=v${pkgver}") +mkmd5sums=('SKIP') build() { - cd $srcdir - msg "Connecting to the GIT server ..." - - if [[ -d $srcdir/$pkgname ]] ; then - cd $pkgname - git fetch origin - else - git clone $_gitrepo - cd $pkgname - fi - - git checkout v$pkgver - - msg "GIT checkout done" - - mkdir -p $srcdir/build - cd $srcdir/build - - cmake -D CMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="" $srcdir/$pkgname/src - make - + cd "$srcdir/$pkgname-$pkgver" + cmake -D CMAKE_BUILD_TYPE=Release -D CMAKE_INSTALL_PREFIX="" src + make } package(){ - cd $srcdir/build - - make DESTDIR=$pkgdir install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install } + +md5sums=('c055522251b2c58b9c6e0d0f0df481c0') diff --git a/pcr/command-not-found/install b/pcr/command-not-found/install index 26f49fa50..50e601258 100644 --- a/pcr/command-not-found/install +++ b/pcr/command-not-found/install @@ -7,8 +7,7 @@ post_upgrade() { } pre_remove() { - rm -rf /var/lib/cnf/*.db - rm -rf /var/lib/cnf/*.tdb + rm -f /var/lib/cnf/*.{db,tbd} } # vim:set ts=2 sw=2 et: diff --git a/pcr/etckeeper/PKGBUILD b/pcr/etckeeper/PKGBUILD index 163c320db..09a5d4d15 100644 --- a/pcr/etckeeper/PKGBUILD +++ b/pcr/etckeeper/PKGBUILD @@ -1,13 +1,12 @@ -# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net> +# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net> # Maintainer (AUR): Buce <dmbuce@gmail.com> # Contributor: Danie Roux <accounts@danieroux.com> - -# This requires makepkg newer than 4.0.3, which at this time means from git +# Contributor: Diogo Leal <estranho@diogoleal.com> pkgname=etckeeper -pkgver=0.64 -pkgdesc="collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." -url="http://kitenet.net/~joey/code/etckeeper/" +pkgver=1.4 +pkgdesc="Collection of tools to let /etc be stored in a git, hg, bzr or darcs repository." +url="http://joeyh.name/code/etckeeper/" license=('GPL2') pkgrel=1 @@ -16,28 +15,28 @@ depends=('inetutils' 'python2') makedepends=('bzr') # bzr must be there at compile time to have bzr support optdepends=('git' 'hg' 'bzr' 'darcs') backup=(etc/etckeeper/etckeeper.conf) -source=("etckeeper-$pkgver::git://git.kitenet.net/etckeeper#tag=${pkgver}" - etckeeper-pacman.patch - etckeeper-archlinux.conf) +source=("libre://$pkgname-$pkgver.tar.gz" $pkgname-pacman.patch $pkgname-archlinux.conf) + +mksource=("$pkgname-$pkgver::git://git.kitenet.net/$pkgname#tag=${pkgver}") +mkmd5sums=('SKIP') build() { - cd "$srcdir/etckeeper-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - # add pacman support to list-to `list-installed` - patch -p0 -i "$srcdir/etckeeper-pacman.patch" + # add pacman support to `list-installed` + patch -p0 -i "${srcdir}/${pkgname}-pacman.patch" # use python2 sed -i 's@^#!/usr/bin/python$@&2@' etckeeper-bzr/__init__.py - - make CONFFILE="$srcdir/etckeeper-archlinux.conf" build + make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" build } package() { - cd "$srcdir/etckeeper-$pkgver" + cd "${srcdir}/${pkgname}-${pkgver}" - make CONFFILE="$srcdir/etckeeper-archlinux.conf" DESTDIR=$pkgdir install + make CONFFILE="${srcdir}/${pkgname}-archlinux.conf" DESTDIR="$pkgdir" install } -md5sums=('SKIP' +md5sums=('74be692fdb2d3352324e9332a270635d' 'f1f00bf9331d1ef7f29b0ac29cdfcbda' '99d8d2838f49fa0f2f21c9e37948100d') |