aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2012-10-30 15:28:04 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2012-10-30 15:29:34 +0000
commita655eb3a2c7f60e0ed887aebf957e5fb57779ba6 (patch)
tree4d3fbf135c35795ce43f194597de8463287a2a77
parent368f9def84881299f4ad5679f3fb2fd6dde27827 (diff)
downloadalpine_aports-a655eb3a2c7f60e0ed887aebf957e5fb57779ba6.tar.bz2
alpine_aports-a655eb3a2c7f60e0ed887aebf957e5fb57779ba6.tar.xz
alpine_aports-a655eb3a2c7f60e0ed887aebf957e5fb57779ba6.zip
main/abuild: upgrade to 2.13.1
-rw-r--r--main/abuild/0001-abuild-include-usr-share-ri-in-doc-packages.patch25
-rw-r--r--main/abuild/APKBUILD9
2 files changed, 4 insertions, 30 deletions
diff --git a/main/abuild/0001-abuild-include-usr-share-ri-in-doc-packages.patch b/main/abuild/0001-abuild-include-usr-share-ri-in-doc-packages.patch
deleted file mode 100644
index 31f5a714e2..0000000000
--- a/main/abuild/0001-abuild-include-usr-share-ri-in-doc-packages.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From f640500e4cac6d126b8c109ffd277c2775243bdd Mon Sep 17 00:00:00 2001
2From: Natanael Copa <ncopa@alpinelinux.org>
3Date: Thu, 11 Oct 2012 18:47:29 +0000
4Subject: [PATCH] abuild: include /usr/share/ri in -doc packages
5
6---
7 abuild.in | 2 +-
8 1 file changed, 1 insertion(+), 1 deletion(-)
9
10diff --git a/abuild.in b/abuild.in
11index 0fde169..62a860f 100755
12--- a/abuild.in
13+++ b/abuild.in
14@@ -1132,7 +1132,7 @@ default_doc() {
15 arch=${arch_doc:-"noarch"}
16
17 local i
18- for i in doc man info html sgml licenses gtk-doc; do
19+ for i in doc man info html sgml licenses gtk-doc ri; do
20 if [ -d "$pkgdir/usr/share/$i" ]; then
21 mkdir -p "$subpkgdir/usr/share"
22 mv "$pkgdir/usr/share/$i" "$subpkgdir/usr/share/"
23--
241.7.12.3
25
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 3753280809..09c8a41371 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -1,9 +1,9 @@
1# Maintainer: Natanael Copa <ncopa@alpinelinux.org> 1# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
2pkgdesc="Script to build Alpine Packages" 2pkgdesc="Script to build Alpine Packages"
3pkgname=abuild 3pkgname=abuild
4pkgver=2.13.0 4pkgver=2.13.1
5_ver=${pkgver%_git*} 5_ver=${pkgver%_git*}
6pkgrel=1 6pkgrel=0
7url=http://git.alpinelinux.org/cgit/abuild/ 7url=http://git.alpinelinux.org/cgit/abuild/
8depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1 uclibc-utils 8depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1 uclibc-utils
9 abuildhelper curl" 9 abuildhelper curl"
@@ -14,7 +14,7 @@ pkggroups="abuild"
14arch="all" 14arch="all"
15license=GPL-2 15license=GPL-2
16source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$_ver.tar.bz2 16source="http://git.alpinelinux.org/cgit/abuild/snapshot/abuild-$_ver.tar.bz2
17 0001-abuild-include-usr-share-ri-in-doc-packages.patch" 17 "
18 18
19_builddir="$srcdir/$pkgname-$_ver" 19_builddir="$srcdir/$pkgname-$_ver"
20prepare() { 20prepare() {
@@ -51,5 +51,4 @@ cpan() {
51 mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/ 51 mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/
52} 52}
53 53
54md5sums="cbb9bc53843510c2c15c2a5eb369cf67 abuild-2.13.0.tar.bz2 54md5sums="def262948a0cb75a0f803c5d86bf8eaf abuild-2.13.1.tar.bz2"
55923930fdc2dd60b7debe2f9fbced33a8 0001-abuild-include-usr-share-ri-in-doc-packages.patch"