diff options
author | Michael Reed <supertron421@gmail.com> | 2014-06-30 17:03:20 -0400 |
---|---|---|
committer | Mike Burns <mike@mike-burns.com> | 2014-07-09 10:45:41 +0200 |
commit | ff2aa079062c7471c39590abf33d3f38b0c4abc7 (patch) | |
tree | 8ab84ff193956feb1cd01f8a8fcc4538b182e7c3 | |
parent | db0be686b5cdee270931eb067269484de18b0653 (diff) |
PKGBUILD-git improvements
- Remove two configure flags which just caused warnings.
- Replace `pkgver` function with a working one.
- Explicititly `cd` into `srcdir` before `gitname` as found in
`PKGBUILD-git.proto`.
- Bump `pkgrel`.
- Specify correct package version.
-rw-r--r-- | arch/PKGBUILD.in | 8 | ||||
-rw-r--r-- | arch/git-PKGBUILD.in | 26 |
2 files changed, 10 insertions, 24 deletions
diff --git a/arch/PKGBUILD.in b/arch/PKGBUILD.in index 3e197d9..957aca9 100644 --- a/arch/PKGBUILD.in +++ b/arch/PKGBUILD.in @@ -1,7 +1,7 @@ # Maintainer: Pat Brisbin <pbrisbin@gmail.com> pkgname='@PACKAGE@' pkgver=@PACKAGE_VERSION@ -pkgrel=1 +pkgrel=2 pkgdesc="rc file (dotfile) management" arch=('any') url="http://thoughtbot.github.io/@PACKAGE@/" @@ -12,21 +12,15 @@ sha1sums=('@DIST_SHA@') build() { cd "$srcdir/$pkgname-$pkgver" - ./configure \ - --disable-debug \ - --disable-dependency-tracking \ --disable-silent-rules \ --prefix=/usr - make } package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/arch/git-PKGBUILD.in b/arch/git-PKGBUILD.in index 5f70822..0f4722d 100644 --- a/arch/git-PKGBUILD.in +++ b/arch/git-PKGBUILD.in @@ -1,8 +1,8 @@ # Maintainer: Pat Brisbin <pbrisbin@gmail.com> _gitname='@PACKAGE@' pkgname=$_gitname-git -pkgver=0.0.0 -pkgrel=3 +pkgver=v1.2.3.r6.gdb0be68 +pkgrel=4 pkgdesc="rc file (dotfile) management" arch=('any') url="http://thoughtbot.github.io/@PACKAGE@/" @@ -13,34 +13,26 @@ source=('git://github.com/thoughtbot/@PACKAGE@') md5sums=('SKIP') pkgver() { - cd "$_gitname" - - git describe --always | sed 's|-|.|g' + cd "$srcdir/$_gitname" + git describe --long | sed -r 's/([^-]*-g)/r\1/;s/-/./g' } prepare() { - cd "$_gitname" - + cd "$srcdir/$_gitname" ./autogen.sh } build() { - cd "$_gitname" - + cd "$srcdir/$_gitname" ./configure \ - --disable-debug \ - --disable-dependency-tracking \ - --disable-silent-rules \ - --prefix=/usr - + --disable-silent-rules \ + --prefix=/usr make } package() { - cd "$_gitname" - + cd "$srcdir/$_gitname" make DESTDIR="$pkgdir/" install - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$_gitname/LICENSE" } |