From 2c8513dd0ec58fa37df391267105e9b92a8a8ec7 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 24 Oct 2011 14:31:47 +0000 Subject: main/apk-tools: implement versioned conflicts from upstream --- main/apk-tools/APKBUILD | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'main/apk-tools/APKBUILD') diff --git a/main/apk-tools/APKBUILD b/main/apk-tools/APKBUILD index 7f0d723b7..e371c5be7 100644 --- a/main/apk-tools/APKBUILD +++ b/main/apk-tools/APKBUILD @@ -1,13 +1,14 @@ # Maintainer: Natanael Copa pkgname=apk-tools pkgver=2.2.0_pre1 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine Package Keeper - package manager for alpine" subpackages="$pkgname-static lua-apk:luaapk" depends= makedepends="zlib-dev openssl-dev lua-dev" source="http://git.alpinelinux.org/cgit/$pkgname/snapshot/$pkgname-$pkgver.tar.bz2 0001-lua-adapt-to-new-API.patch + 0002-solver-pkg-implement-versioned-conflicts.patch " url="http://git.alpinelinux.org/cgit/apk-tools/" @@ -56,4 +57,5 @@ luaapk() { } md5sums="cda5172b66e7778b855dfda44e5f174f apk-tools-2.2.0_pre1.tar.bz2 -8ba03addeab7c2aa534f311e921191ae 0001-lua-adapt-to-new-API.patch" +2e8538b8d46c9888cd6adde5212a7217 0001-lua-adapt-to-new-API.patch +8894f1cfc751b441910db949a7c33178 0002-solver-pkg-implement-versioned-conflicts.patch" -- cgit v1.2.3