17.30.0

Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>

2 files changed, 51 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ea5e6f6e319f..5f7355602c78 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,19 @@
 pkgbase = libzypp
 	pkgdesc = ZYpp Package Management library
-	pkgver = 17.28.8
+	pkgver = 17.30.0
 	pkgrel = 1
-	url = https://github.com/openSUSE/libzypp
+	url = http://doc.opensuse.org/projects/libzypp/HEAD/
 	arch = x86_64
 	license = GPL
+	makedepends = boost-libs
+	makedepends = gpgme
+	makedepends = libproxy
+	makedepends = libsigc++
+	makedepends = libsolv
+	makedepends = libsystemd
+	makedepends = libxml2
+	makedepends = protobuf
+	makedepends = yaml-cpp
 	makedepends = asciidoc
 	makedepends = boost
 	makedepends = cmake
@@ -14,8 +23,10 @@ pkgbase = libzypp
 	makedepends = git
 	makedepends = gnupg
 	makedepends = graphviz
-	makedepends = ninja
-	makedepends = protobuf
+	source = libzypp-17.30.0::https://github.com/openSUSE/libzypp/archive/17.30.0.tar.gz
+	sha256sums = 3410a4cf7a40467c544ad221f3116aab6ba198b27a9c150116c93b5950f74815
+
+pkgname = libzypp
 	depends = boost-libs
 	depends = gpgme
 	depends = libproxy
@@ -23,8 +34,8 @@ pkgbase = libzypp
 	depends = libsolv
 	depends = libsystemd
 	depends = libxml2
+	depends = protobuf
 	depends = yaml-cpp
-	source = libzypp-17.28.8::https://github.com/openSUSE/libzypp/archive/17.28.8.tar.gz
-	sha256sums = 1b9a1d3f5d0a8042161181330f47838e13210ac0a862ad3ea19b7e8ae783ae38
 
-pkgname = libzypp
+pkgname = libzypp-doc
+	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index a12c99d1a1cf..dfbbd21ce7c1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Yurii Kolesnykov <root@yurikoles.com>
 # Contributor: Daan De Meyer <daan.j.demeyer@gmail.com>
 
-pkgname=libzypp
-pkgver=17.28.8
+pkgbase=libzypp
+pkgname=(libzypp libzypp-doc)
+pkgver=17.30.0
 pkgrel=1
 pkgdesc="ZYpp Package Management library"
 arch=('x86_64')
-url="https://github.com/openSUSE/${pkgname}"
+url='http://doc.opensuse.org/projects/libzypp/HEAD/'
 license=('GPL')
-depends=(
+makedepends=(
   'boost-libs'
   'gpgme'
   'libproxy'
@@ -16,9 +17,8 @@ depends=(
   'libsolv'
   'libsystemd'
   'libxml2'
+  'protobuf'
   'yaml-cpp'
-)
-makedepends=(
   'asciidoc'
   'boost'
   'cmake'
@@ -28,42 +28,56 @@ makedepends=(
   'git'
   'gnupg'
   'graphviz'
-  'ninja'
-  'protobuf'
 )
 source=("${pkgname}-${pkgver}::https://github.com/openSUSE/${pkgname}/archive/${pkgver}.tar.gz")
-sha256sums=('1b9a1d3f5d0a8042161181330f47838e13210ac0a862ad3ea19b7e8ae783ae38')
-
-prepare() {
-  # CMake doesn't find FindLibSolv.cmake in /usr/share/cmake/Modules
-  cp /usr/share/cmake/Modules/FindLibSolv.cmake "${pkgname}-${pkgver}"/cmake/modules/
-  rm -rf build
-}
+sha256sums=('3410a4cf7a40467c544ad221f3116aab6ba198b27a9c150116c93b5950f74815')
 
 build() {
   cmake \
     -B build \
     -S "${pkgname}-${pkgver}" \
-    -G Ninja \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_INSTALL_PREFIX=/usr \
+    -D CMAKE_INSTALL_LIBEXECDIR=lib \
     -D LIB=lib \
     -D CMAKE_SKIP_RPATH=1 \
     -D DISABLE_MEDIABACKEND_TESTS=ON \
 	-D ENABLE_BUILD_DOCS=ON \
 	-D ENABLE_BUILD_TRANS=ON \
 	-D ENABLE_BUILD_TESTS=ON \
-	-D ENABLE_ZCHUNK_COMPRESSION=ON \
 	-D ENABLE_ZSTD_COMPRESSION=ON \
 
   cmake --build build
 }
 
-package() {
+#check() {
+#  ctest --test-dir build
+#}
+
+package_libzypp() {
+  depends=(
+    'boost-libs'
+    'gpgme'
+    'libproxy'
+    'libsigc++'
+    'libsolv'
+    'libsystemd'
+    'libxml2'
+    'protobuf'
+    'yaml-cpp'
+  )
+
   DESTDIR="${pkgdir}" cmake --install build
 
   # cmake fix (see GH#28)
   mkdir -p "${pkgdir}"/usr/lib/cmake/Zypp
   mv "${pkgdir}"/usr/share/cmake/Modules/* "${pkgdir}"/usr/lib/cmake/Zypp/
-  rm -rf "${pkgdir}"/usr/share/cmake
+  rm -rf "${pkgdir}"/usr/share/{cmake,doc}
+}
+
+package_libzypp-doc() {
+  arch=('any')
+  DESTDIR="${pkgdir}" cmake --install build/doc
+  mv "${pkgdir}"/usr/share/doc/packages/libzypp/libzypp "${pkgdir}"/usr/share/doc/libzypp
+  rm -rf "${pkgdir}"/usr/share/{doc/packages,man}
 }