aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2016-08-25 07:47:35 +0000
committerFrancesco Colista <fcolista@alpinelinux.org>2016-08-25 07:55:48 +0000
commit3f23a4137b928c5ea363afd39af52af49eacb5ce (patch)
tree1b49ce93c4cef47571c7067d477d2f0a97f949ce
parent9994bb8b5c328ba14a44119d774fba884c74faaa (diff)
downloadaports-3f23a4137b928c5ea363afd39af52af49eacb5ce.tar.bz2
aports-3f23a4137b928c5ea363afd39af52af49eacb5ce.tar.xz
community/rpm: upgrade to 4.12.0.1
-rw-r--r--community/rpm/APKBUILD (renamed from testing/rpm/APKBUILD)34
-rw-r--r--community/rpm/rpm-uclibc.patch (renamed from testing/rpm/rpm-uclibc.patch)0
2 files changed, 13 insertions, 21 deletions
diff --git a/testing/rpm/APKBUILD b/community/rpm/APKBUILD
index c0e867b0e3..f72c48e931 100644
--- a/testing/rpm/APKBUILD
+++ b/community/rpm/APKBUILD
@@ -1,34 +1,26 @@
# Contributor: William Pitcock <nenolod@dereferenced.org>
# Maintainer: William Pitcock <nenolod@dereferenced.org>
pkgname=rpm
-pkgver=4.11.0.1
-pkgrel=2
+pkgver=4.12.0.1
+pkgrel=0
pkgdesc="The RPM package manager"
url="http://www.rpm.org/"
arch="all"
license="GPL2 LGPL2+"
depends=""
depends_dev="nspr-dev nss-dev db-dev lua-dev zlib-dev bzip2-dev xz-dev
- libelf-dev file-dev popt-dev libcap-dev acl-dev"
-makedepends="$depends_dev graphviz gettext-dev python-dev"
+ libelf-dev file-dev popt-dev libcap-dev acl-dev libarchive-dev
+ binutils-dev"
+makedepends="$depends_dev graphviz gettext-dev python2-dev"
install=""
subpackages="$pkgname-dev $pkgname-doc $pkgname-lang py-rpm:py_rpm"
-source="http://rpm.org/releases/rpm-4.11.x/rpm-$pkgver.tar.bz2
- rpm-uclibc.patch"
+source="http://rpm.org/releases/rpm-4.12.x/$pkgname-$pkgver.tar.bz2
+ rpm-uclibc.patch"
-_builddir="$srcdir"/rpm-$pkgver
-prepare() {
- local i
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
+builddir="$srcdir"/rpm-$pkgver
build() {
- cd "$_builddir"
+ cd "$builddir"
_EXT_CPPFLAGS="-I/usr/include/nspr -I/usr/include/nss" \
CFLAGS="$CFLAGS $_EXT_CPPFLAGS" CPPFLAGS="$CPPFLAGS $_EXT_CPPFLAGS" \
LIBS="$LIBS -lintl" \
@@ -45,7 +37,7 @@ build() {
}
package() {
- cd "$_builddir"
+ cd "$builddir"
make DESTDIR="$pkgdir" install || return 1
}
@@ -54,9 +46,9 @@ py_rpm() {
mv "$pkgdir"/usr/lib/python* "$subpkgdir"/usr/lib || return 1
}
-md5sums="b35f5359e0d4494d7b11e8d0c1512a0d rpm-4.11.0.1.tar.bz2
+md5sums="c06a691765252d2b381a7942a9669856 rpm-4.12.0.1.tar.bz2
528cdfc96ebfe8db3e389abdcf024d94 rpm-uclibc.patch"
-sha256sums="98496c0c73095d7c66a8b6f1d8ab00998e1daf4e46a017ae74190c65132ffb21 rpm-4.11.0.1.tar.bz2
+sha256sums="77ddd228fc332193c874aa0b424f41db1ff8b7edbb6a338703ef747851f50229 rpm-4.12.0.1.tar.bz2
e963102ba11f83b691ad27ca7df9283524710a8fbd458e85e6ac84f3413778e9 rpm-uclibc.patch"
-sha512sums="72bd3054b2d0def1e25fba7113eda14def38baef62b558e65cafaf3b374823d0905d982772cffddfd9dc6698eff293251acb2ace7dfda0964085669caa88d535 rpm-4.11.0.1.tar.bz2
+sha512sums="ae751b04cec2463f1f259aec4b4750fca1e4cef6144b7e612d0c94f7b6a2864ed119547568f6acebb7fefddb7b040b6021c1f32cf465963db0b627f524c5760f rpm-4.12.0.1.tar.bz2
7a5796716b0f53e0c7fde5d7f42bd767eb2dd03fda03179779b7085e7f0dfc72a1c246621458d3bbe6227a5d59074b3f29147eea34d889a700b3ff47b799c2ce rpm-uclibc.patch"
diff --git a/testing/rpm/rpm-uclibc.patch b/community/rpm/rpm-uclibc.patch
index 12636f0fc9..12636f0fc9 100644
--- a/testing/rpm/rpm-uclibc.patch
+++ b/community/rpm/rpm-uclibc.patch