sync with aur/libzypp

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

3 files changed, 72 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 08133034bd47..b9e9bc9bb755 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,30 @@
 pkgbase = libzypp-git
-	pkgdesc = Package, Patch, Pattern, and Product Management
-	pkgver = 17.22.1
-	pkgrel = 2
+	pkgdesc = Library for package, patch, pattern and product management
+	pkgver = 17.24.1.r9.g52f82f322
+	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 = libsigc++
-	makedepends = nginx
-	makedepends = fcgi
-	depends = libsolv-git
-	depends = openssl
-	depends = curl
+	makedepends = graphviz
+	makedepends = ninja
+	depends = boost-libs
+	depends = gpgme
+	depends = libproxy
+	depends = libsigc++
+	depends = libsolv
 	depends = libsystemd
+	depends = libxml2
 	provides = libzypp
 	conflicts = libzypp
-	source = git+https://github.com/openSUSE/libzypp.git
+	source = libzypp-git::git+https://github.com/openSUSE/libzypp.git
 	sha256sums = SKIP
 
 pkgname = libzypp-git
diff --git a/.gitignore b/.gitignore
index db9467c227dd..d80a7e741e96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
-libzypp
+*.tar.gz
 src
 pkg
 *.pkg.*
+*.log
diff --git a/PKGBUILD b/PKGBUILD
index 4ff624a4b195..715ef08a2497 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,51 +1,77 @@
 # Maintainer: Yurii Kolesnykov <root@yurikoles.com>
+# Submitter: Spyhawk
 
-pkgname=libzypp-git
-pkgver=17.22.1
-pkgrel=2
-pkgdesc="Package, Patch, Pattern, and Product Management"
+_pkgname=libzypp
+pkgname="${_pkgname}-git"
+pkgver=17.24.1.r9.g52f82f322
+pkgrel=1
+pkgdesc='Library for package, patch, pattern and product management'
 arch=('i686' 'x86_64')
 url="https://github.com/openSUSE/libzypp"
 license=('GPL')
-depends=('libsolv-git' 'openssl' 'curl' 'libsystemd')
-makedepends=('git' 'cmake' 'ninja' 'boost' 'dejagnu' 'graphviz'
-             'libxml2' 'expat' 'gnupg' 'rpm-org' 'libproxy' 'asciidoc'
-             'libsigc++' 'nginx' 'fcgi')
-provides=('libzypp')
-conflicts=('libzypp')
-source=('git+https://github.com/openSUSE/libzypp.git')
+depends=(
+  'boost-libs'
+  'gpgme'
+  'libproxy'
+  'libsigc++'
+  'libsolv'
+  'libsystemd'
+  'libxml2'
+)
+makedepends=(
+  'asciidoc'
+  'boost'
+  'cmake'
+  'dejagnu'
+  'expat'
+  'git'
+  'gnupg'
+  'graphviz'
+  'ninja'
+)
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
+source=("${pkgname}::git+https://github.com/openSUSE/${_pkgname}.git")
 sha256sums=('SKIP')
-_gitname="libzypp"
+
 
 pkgver() {
-  cd "${_gitname}"
-  echo $(git describe --always | sed -r 's/-/./g')
+  cd "${pkgname}"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+  # CMake doesn't find FindLibSolv.cmake in /usr/share/cmake/Modules
+  cp /usr/share/cmake/Modules/FindLibSolv.cmake "${pkgname}"/cmake/modules/
+
+  rm -rf build
 }
 
 build() {
-  cd "${_gitname}"
-  mkdir -p build && cd build
   cmake \
+    -B build \
+    -S "${pkgname}" \
     -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 "${_gitname}/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
 }