diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2011-09-02 09:38:46 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2011-09-02 09:38:46 +0000 |
| commit | 40494c6aae8017f60f9e3bdbf67867df02b1cac6 (patch) | |
| tree | 96ee4cd8befd4405ef3a5c6db99074265c67e36f | |
| parent | 5fe915321b34226175e51c1a6df0523d7480caf5 (diff) | |
| download | aports-40494c6aae8017f60f9e3bdbf67867df02b1cac6.tar.bz2 aports-40494c6aae8017f60f9e3bdbf67867df02b1cac6.tar.xz | |
main/abuild: backport langdir feature in abuild
the langdir feature allows apkbuild to look for language packs in
different dir(s)
| -rw-r--r-- | main/abuild/0001-abuild-make-it-possible-to-override-lang_subpkg.patch | 48 | ||||
| -rw-r--r-- | main/abuild/APKBUILD | 6 |
2 files changed, 52 insertions, 2 deletions
diff --git a/main/abuild/0001-abuild-make-it-possible-to-override-lang_subpkg.patch b/main/abuild/0001-abuild-make-it-possible-to-override-lang_subpkg.patch new file mode 100644 index 000000000..0be210ef4 --- /dev/null +++ b/main/abuild/0001-abuild-make-it-possible-to-override-lang_subpkg.patch @@ -0,0 +1,48 @@ +From 43f888ad5e92b2242f512992c71902100956a87a Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Fri, 2 Sep 2011 09:35:55 +0000 +Subject: [PATCH] abuild: make it possible to override lang_subpkg + +We alos introduce $langdir where you can set other dir to look for +localization dirs. +--- + abuild.in | 16 ++++++++++++---- + 1 files changed, 12 insertions(+), 4 deletions(-) + +diff --git a/abuild.in b/abuild.in +index 4fd739f..e5a24eb 100755 +--- a/abuild.in ++++ b/abuild.in +@@ -478,17 +478,25 @@ prepare_subpackages() { + fi + } + +-lang_subpkg() { ++default_lang_subpkg() { + if [ -z "$lang" ]; then + error "lang is not set" + return 1 + fi ++ pkgdesc="$pkgname language pack for $lang" + arch="noarch" + install_if="$pkgname=$pkgver-r$pkgrel lang-$lang" +- mkdir -p "$subpkgdir"/usr/share/locale +- mv "$pkgdir"/usr/share/locale/$lang* \ +- "$subpkgdir"/usr/share/locale/ \ ++ local dir ++ for dir in ${langdir:-/usr/share/locale}; do ++ mkdir -p "$subpkgdir"/$dir ++ mv "$pkgdir"/$dir/$lang* \ ++ "$subpkgdir"/$dir/ \ + || return 1 ++ done ++} ++ ++lang_subpkg() { ++ default_lang_subpkg + } + + prepare_language_packs() { +-- +1.7.6.1 + diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD index 933aaf74c..a2d2835ba 100644 --- a/main/abuild/APKBUILD +++ b/main/abuild/APKBUILD @@ -2,9 +2,10 @@ pkgdesc="Script to build Alpine Packages" pkgname=abuild pkgver=2.10.0 -pkgrel=0 +pkgrel=1 url=http://git.alpinelinux.org/cgit/abuild/ source="http://git.alpinelinux.org/cgit/abuild.git/snapshot/abuild-$pkgver.tar.bz2 + 0001-abuild-make-it-possible-to-override-lang_subpkg.patch " depends="fakeroot file sudo pax-utils openssl apk-tools>=2.0.7-r1 uclibc-utils abuildhelper" makedepends="openssl-dev pkgconfig" @@ -37,4 +38,5 @@ package() { install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles } -md5sums="fd310ee9f47726ed1e1c64e795192962 abuild-2.10.0.tar.bz2" +md5sums="fd310ee9f47726ed1e1c64e795192962 abuild-2.10.0.tar.bz2 +68451f36bcede50fc391fa944a11ecc2 0001-abuild-make-it-possible-to-override-lang_subpkg.patch" |