17.24.1

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

3 files changed, 66 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 70a67657611a..5ecf6d68f317 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,29 @@
 pkgbase = libzypp
 	pkgdesc = Package, Patch, Pattern, and Product Management
-	pkgver = 17.23.8
+	pkgver = 17.24.1
 	pkgrel = 1
 	url = https://github.com/openSUSE/libzypp
 	arch = i686
 	arch = x86_64
 	license = GPL
-	makedepends = git
-	makedepends = cmake
-	makedepends = ninja
+	makedepends = asciidoc
 	makedepends = boost
+	makedepends = cmake
 	makedepends = dejagnu
-	makedepends = graphviz
-	makedepends = libxml2
 	makedepends = expat
+	makedepends = git
 	makedepends = gnupg
-	makedepends = rpm-org
-	makedepends = libproxy
-	makedepends = asciidoc
+	makedepends = graphviz
+	makedepends = ninja
+	depends = boost-libs
+	depends = gpgme
+	depends = libproxy
+	depends = libsigc++
 	depends = libsolv
-	depends = openssl
-	depends = curl
 	depends = libsystemd
-	provides = libzypp
-	source = https://github.com/openSUSE/libzypp/archive/17.23.8.tar.gz
-	sha256sums = 6c0d4a1dad77017263b48f097d835f152afed50b513652c8e7ee03d93ae5093d
+	depends = libxml2
+	source = libzypp-17.24.1::https://github.com/openSUSE/libzypp/archive/17.24.1.tar.gz
+	sha256sums = fcb44a4ce56d6976e15267206971d6a98641964a16ccc601e854056b4b7874cb
 
 pkgname = libzypp
 
diff --git a/.gitignore b/.gitignore
index b56f969fd70d..d80a7e741e96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
+*.tar.gz
 src
 pkg
 *.pkg.*
-*.tar.gz
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 49ea598a4490..c41a592e2af2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,44 +1,72 @@
 # Maintainer: Yurii Kolesnykov <root@yurikoles.com>
-# Co-Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: Daan De Meyer <daan.j.demeyer@gmail.com>
 
 pkgname=libzypp
-pkgver=17.23.8
+pkgver=17.24.1
 pkgrel=1
 pkgdesc="Package, Patch, Pattern, and Product Management"
 arch=('i686' 'x86_64')
 url="https://github.com/openSUSE/libzypp"
 license=('GPL')
-depends=('libsolv' 'openssl' 'curl' 'libsystemd')
-makedepends=('git' 'cmake' 'ninja' 'boost' 'dejagnu' 'graphviz'
-             'libxml2' 'expat' 'gnupg' 'rpm-org' 'libproxy' 'asciidoc')
-provides=('libzypp')
-source=("https://github.com/openSUSE/libzypp/archive/${pkgver}.tar.gz")
-sha256sums=('6c0d4a1dad77017263b48f097d835f152afed50b513652c8e7ee03d93ae5093d')
+depends=(
+  'boost-libs'
+  'gpgme'
+  'libproxy'
+  'libsigc++'
+  'libsolv'
+  'libsystemd'
+  'libxml2'
+)
+makedepends=(
+  'asciidoc'
+  'boost'
+  'cmake'
+  'dejagnu'
+  'expat'
+  'git'
+  'gnupg'
+  'graphviz'
+  'ninja'
+)
+source=("${pkgname}-${pkgver}::https://github.com/openSUSE/libzypp/archive/${pkgver}.tar.gz")
+sha256sums=('fcb44a4ce56d6976e15267206971d6a98641964a16ccc601e854056b4b7874cb')
+
+prepare() {
+  # CMake doesn't find FindLibSolv.cmake in /usr/share/cmake/Modules
+  cp /usr/share/cmake/Modules/FindLibSolv.cmake "${pkgname}-${pkgver}"/cmake/modules/
+
+  # Remove once https://github.com/openSUSE/libzypp/pull/236 is merged/released.
+  sed -i '15,16 s/^/\/\//' "${pkgname}-${pkgver}"/zypp/parser/xml/libxmlfwd.h
+  sed -i '19 s/^/\/\//' "${pkgname}-${pkgver}"/zypp/parser/xml/libxmlfwd.h
+
+  rm -rf build
+}
 
 build() {
-  cd "${pkgname}-${pkgver}"
-  mkdir -p build && cd build
   cmake \
+    -B build \
+    -S "${pkgname}-${pkgver}" \
     -G Ninja \
-    -D CMAKE_INSTALL_PREFIX=/usr \
     -D CMAKE_BUILD_TYPE=Release \
+    -D CMAKE_INSTALL_PREFIX=/usr \
+    -D LIB=lib \
     -D CMAKE_SKIP_RPATH=1 \
-    -D DISABLE_AUTODOCS=1 \
     -D DISABLE_LIBPROXY=0 \
-    ..
-  ninja
+    -D DISABLE_AUTODOCS=1 \
+    -D DISABLE_MEDIABACKEND_TESTS=ON \
+
+  ninja -C build
 }
 
+# check() {
+#   ninja -C build test
+# }
+
 package() {
-  cd "${pkgname}-${pkgver}/build"
-  DESTDIR="${pkgdir}/" ninja install
+  DESTDIR="${pkgdir}" ninja -C build install
 
   # cmake fix (see GH#28)
-  mkdir -p "${pkgdir}/usr/lib/cmake/Zypp"
-  mv "${pkgdir}/usr/share/cmake/Modules/FindZypp.cmake" "${pkgdir}/usr/lib/cmake/Zypp/ZyppConfig.cmake"
-  mv "${pkgdir}/usr/share/cmake/Modules/ZyppCommon.cmake" "${pkgdir}/usr/lib/cmake/Zypp/ZyppCommon.cmake"
-  
-  # hacky lib64 symlink fix
-  mv "${pkgdir}"/usr/lib64/* "${pkgdir}/usr/lib/"
-  rmdir "${pkgdir}/usr/lib64"
+  mkdir -p "${pkgdir}"/usr/lib/cmake/Zypp
+  mv "${pkgdir}"/usr/share/cmake/Modules/* "${pkgdir}"/usr/lib/cmake/Zypp/
+  rm -rf "${pkgdir}"/usr/share/cmake
 }