aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeo <thinkabit.ukim@gmail.com>2019-05-07 10:04:20 -0300
committerLeo <thinkabit.ukim@gmail.com>2019-06-07 08:10:27 -0300
commit31a7736df5e90c04eabd6df2ee3ae348919ffbf1 (patch)
tree66a64e131816989daeecbcf8ff4f0fd6e8fce042
parent2373c7db145556dbdac5e354dec9e7c91b712045 (diff)
downloadaports-31a7736df5e90c04eabd6df2ee3ae348919ffbf1.tar.bz2
aports-31a7736df5e90c04eabd6df2ee3ae348919ffbf1.tar.xz
testing/createrepo_c: upgrade to 0.13.1
- Fix license - Switch to py3
-rw-r--r--testing/createrepo_c/10-libdir.patch8
-rw-r--r--testing/createrepo_c/APKBUILD29
2 files changed, 13 insertions, 24 deletions
diff --git a/testing/createrepo_c/10-libdir.patch b/testing/createrepo_c/10-libdir.patch
deleted file mode 100644
index 82848b4030..0000000000
--- a/testing/createrepo_c/10-libdir.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- ./src/CMakeLists.txt.orig
-+++ ./src/CMakeLists.txt
-@@ -110,4 +110 @@
--IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
-- SET (LIB_SUFFIX "64")
--ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
--SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-+SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
diff --git a/testing/createrepo_c/APKBUILD b/testing/createrepo_c/APKBUILD
index 57f8abc34b..9da3311331 100644
--- a/testing/createrepo_c/APKBUILD
+++ b/testing/createrepo_c/APKBUILD
@@ -1,12 +1,12 @@
# Contributor:
# Maintainer: Paul Morgan <jumanjiman@gmail.com>
pkgname=createrepo_c
-pkgver=0.11.1
+pkgver=0.13.1
pkgrel=0
pkgdesc="C implementation of createrepo"
url="https://github.com/rpm-software-management/createrepo_c/"
arch="all"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
makedepends="
bash-completion
bzip2-dev
@@ -17,7 +17,7 @@ makedepends="
glib-dev
openssl-dev
libxml2-dev
- python2-dev
+ python3-dev
rpm-dev
scanelf
sqlite-dev
@@ -25,10 +25,8 @@ makedepends="
zlib-dev
"
checkdepends="
- ${makedepends}
- check
check-dev
- py-nose
+ py3-nose
xz
"
subpackages="
@@ -36,13 +34,11 @@ subpackages="
${pkgname}-dev
${pkgname}-doc
${pkgname}-libs
- py2-${pkgname}:py2
+ py3-${pkgname}:py3
"
source="
${pkgname}-${pkgver}.tar.gz::https://github.com/rpm-software-management/createrepo_c/archive/${pkgver}.tar.gz
- 10-libdir.patch
"
-builddir="${srcdir}/${pkgname}-${pkgver}/"
build() {
mkdir "${builddir}"/build
@@ -55,11 +51,13 @@ build() {
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
- -DCMAKE_SKIP_BUILD_RPATH=false \
+ -DCMAKE_SKIP_BUILD_RPATH=true \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=false \
-DCMAKE_INSTALL_RPATH=/usr/lib \
-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=true \
- -DPYTHON_DESIRED=2
+ -DPYTHON_DESIRED=3 \
+ -DWITH_ZCHUNK=OFF \
+ -DWITH_LIBMODULEMD=OFF
make
}
@@ -74,9 +72,9 @@ package() {
make install/strip DESTDIR=${pkgdir}
}
-py2() {
- pkgdesc="Python2 bindings for createrepo_c"
- depends="python2 ${pkgname}-libs"
+py3() {
+ pkgdesc="Python3 bindings for createrepo_c"
+ depends="python3 ${pkgname}-libs"
# This is architecture-specific and provides a *.so file.
mkdir -p "${subpkgdir}"/usr/lib
@@ -92,5 +90,4 @@ bashcomp() {
mv "${pkgdir}"/usr/share/bash-completion "${subpkgdir}"/usr/share/
}
-sha512sums="b07b656a625c4637f521b6bcff1d4eb22df930b9033824dd7ccbd6e7eea66aa4df4c52cc84bc32391d20013bb3c06c02afcb8801c676af5ad860992197681e7a createrepo_c-0.11.1.tar.gz
-df861d341d2acf5aba85d2bf0b959a7b22a29315efb0efeeada3871d7f1c4be035d27ff2408f55f3df24e6e11a8e5d7c4c88fd0ce25e4377b5452e861b40e188 10-libdir.patch"
+sha512sums="30885bde608712bb781348a45e09099b2993b2d949926f63237d5299b1b4f16fa47a2e9942ac6dbc374e7079afebf7168ec50d9d3ba7d4a4ae61cfebaa6c9265 createrepo_c-0.13.1.tar.gz"