Update to upstream release 0.6.35

2 files changed, 41 insertions, 34 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e6bbcfdbf23b..fa7f6ad1a99d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = libsolv
 	pkgdesc = Library for solving packages and reading repositories
-	pkgver = 0.6.34
+	pkgver = 0.6.35
 	pkgrel = 1
 	url = https://github.com/openSUSE/libsolv
 	arch = i686
@@ -11,15 +11,17 @@ pkgbase = libsolv
 	makedepends = python
 	makedepends = ruby
 	makedepends = swig
+	depends = bzip2
 	depends = expat
 	depends = rpm-org
 	depends = xz
 	depends = zlib
+	depends = zstd
 	optdepends = perl: for perl bindings
 	optdepends = python: for python bindings
 	optdepends = ruby: for ruby bindings
-	source = https://github.com/openSUSE/libsolv/archive/0.6.34/libsolv-0.6.34.tar.gz
-	md5sums = b61f8268a60086ae6fbf7a3454d669cb
+	source = https://github.com/openSUSE/libsolv/archive/0.6.35/libsolv-0.6.35.tar.gz
+	md5sums = 51f52ee010c41a1bdd41a1ee06085946
 
 pkgname = libsolv
 
diff --git a/PKGBUILD b/PKGBUILD
index 5983e1a73552..074a20ea89b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
 pkgname=libsolv
-pkgver=0.6.34
+pkgver=0.6.35
 pkgrel=1
 pkgdesc="Library for solving packages and reading repositories"
 arch=('i686' 'x86_64')
 url="https://github.com/openSUSE/$pkgname"
 license=('BSD')
-depends=('expat' 'rpm-org' 'xz' 'zlib')
+depends=('bzip2' 'expat' 'rpm-org' 'xz' 'zlib' 'zstd')
 makedepends=('cmake' 'perl' 'python' 'ruby' 'swig')
 optdepends=('perl: for perl bindings'
             'python: for python bindings'
             'ruby: for ruby bindings')
 source=("$url/archive/$pkgver/$pkgname-$pkgver.tar.gz")
-md5sums=('b61f8268a60086ae6fbf7a3454d669cb')
+md5sums=('51f52ee010c41a1bdd41a1ee06085946')
 
 prepare() {
 	cd "$pkgname-$pkgver"
@@ -21,35 +21,40 @@ prepare() {
 
 build() {
 	cd "$pkgname-$pkgver"/build
-	cmake -DCMAKE_BUILD_TYPE=Release     \
-	      -DCMAKE_INSTALL_PREFIX=/usr    \
-	      -DLIB=/lib                     \
-	      -DUSE_VENDORDIRS=ON            \
-	      -DFEDORA=1                     \
-	      -DENABLE_APPDATA=ON            \
-	      -DENABLE_ARCHREPO=ON           \
-	      -DENABLE_BZIP2_COMPRESSION=ON  \
-	      -DENABLE_COMPLEX_DEPS=1        \
-	      -DENABLE_COMPS=ON              \
-	      -DENABLE_CUDFREPO=ON           \
-	      -DENABLE_DEBIAN=ON             \
-	      -DENABLE_HAIKU=OFF             \
-	      -DENABLE_HELIXREPO=ON          \
-	      -DENABLE_LZMA_COMPRESSION=ON   \
-	      -DENABLE_MDKREPO=ON            \
-	      -DENABLE_PERL=ON               \
-	      -DENABLE_PUBKEY=ON             \
-	      -DENABLE_PYTHON=ON             \
-	      -DENABLE_RPMDB=ON              \
-	      -DENABLE_RPMDB_BYRPMHEADER=ON  \
-	      -DENABLE_RPMMD=ON              \
-	      -DENABLE_RPMPKG=ON             \
-	      -DENABLE_RUBY=ON               \
-	      -DENABLE_TCL=OFF               \
-	      -DENABLE_SUSEREPO=ON           \
-	      -DMULTI_SEMANTICS=ON           \
-	      -DWITH_LIBXML2=OFF             \
+
+	cmake -DCMAKE_BUILD_TYPE=Release \
+	      -DCMAKE_C_FLAGS="$CFLAGS $CPPFLAGS" \
+	      -DCMAKE_INSTALL_PREFIX=/usr \
+	      -DLIB=/lib \
+	      -DUSE_VENDORDIRS=ON \
+	      -DFEDORA=1 \
+	      -DENABLE_APPDATA=ON \
+	      -DENABLE_ARCHREPO=ON \
+	      -DENABLE_BZIP2_COMPRESSION=ON \
+	      -DENABLE_COMPLEX_DEPS=1 \
+	      -DENABLE_COMPS=ON \
+	      -DENABLE_CUDFREPO=ON \
+	      -DENABLE_DEBIAN=ON \
+	      -DENABLE_HAIKU=OFF \
+	      -DENABLE_HELIXREPO=ON \
+	      -DENABLE_LZMA_COMPRESSION=ON \
+	      -DENABLE_MDKREPO=ON \
+	      -DENABLE_PERL=ON \
+	      -DENABLE_PUBKEY=ON \
+	      -DENABLE_PYTHON=ON \
+	      -DENABLE_RPMDB=ON \
+	      -DENABLE_RPMDB_BYRPMHEADER=ON \
+	      -DENABLE_RPMMD=ON \
+	      -DENABLE_RPMPKG=ON \
+	      -DENABLE_RUBY=ON \
+	      -DENABLE_TCL=OFF \
+	      -DENABLE_SUSEREPO=ON \
+	      -DENABLE_ZCHUNK_COMPRESSION=ON \
+	      -DENABLE_ZSTD_COMPRESSION=ON \
+	      -DMULTI_SEMANTICS=ON \
+	      -DWITH_LIBXML2=OFF \
 	      ..
+
 	make
 }