summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2020-09-23 13:19:02 +0300
committerYurii Kolesnykov2020-09-23 13:19:16 +0300
commitf01eabd02aa033ca89fee35417a0a05ad77266c5 (patch)
tree5a3dff93d91e11998f862597f9b0cc29ca998416
parent5f2aa44986f3ec4c931a6629117a7d312442be08 (diff)
downloadaur-f01eabd02aa033ca89fee35417a0a05ad77266c5.tar.gz
1.14.39
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO7
-rw-r--r--.gitignore1
-rw-r--r--PKGBUILD28
3 files changed, 19 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9c4c7c7c506..a632780326d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zypper
pkgdesc = Command line software manager using libzypp
- pkgver = 1.14.36
+ pkgver = 1.14.39
pkgrel = 1
url = https://github.com/openSUSE/zypper
arch = i686
@@ -11,6 +11,7 @@ pkgbase = zypper
makedepends = ninja
makedepends = boost
makedepends = asciidoc
+ makedepends = asciidoctor
depends = libzypp
depends = libxml2
depends = procps
@@ -19,9 +20,9 @@ pkgbase = zypper
provides = zypper
provides = apt
conflicts = apt
- source = https://github.com/openSUSE/zypper/archive/1.14.36.tar.gz
+ source = zypper-1.14.39.tar.gz::https://github.com/openSUSE/zypper/archive/1.14.39.tar.gz
source = make-ZyppCommon-cmake-module-includable.patch
- sha256sums = a50e6e4aa8dea822cbc3eb5c47815a864e4f95dc404728ef21639439fe4317ea
+ sha256sums = 6a86eef7dc1b6da5021ae032929e10038b7586f8edf8b2e3aeb40f44ee88927d
sha256sums = f5cdd85109c58d786f1124fa3cab1c5431a93a8d87a59117eac257c6e4698ae7
pkgname = zypper
diff --git a/.gitignore b/.gitignore
index d588b5b276e..84e762a4f87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.tar.gz
src
+*.log
pkg
*.pkg.*
diff --git a/PKGBUILD b/PKGBUILD
index 711999bfef0..6abff46e91a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
+# Contributor: Daan De Meye <daan.j.demeyer@gmail.com>
# Contributor: Silvio Knizek <knizek@b1-systems.de>
pkgname=zypper
-pkgver=1.14.36
+pkgver=1.14.39
pkgrel=1
pkgdesc="Command line software manager using libzypp"
arch=('i686' 'x86_64')
@@ -12,9 +13,9 @@ depends=('libzypp' 'libxml2' 'procps' 'readline' 'augeas')
makedepends=('git' 'cmake' 'ninja' 'boost' 'asciidoc' 'asciidoctor')
provides=('zypper' 'apt')
conflicts=('apt')
-source=("https://github.com/openSUSE/zypper/archive/${pkgver}.tar.gz"
+source=("zypper-${pkgver}.tar.gz::https://github.com/openSUSE/zypper/archive/${pkgver}.tar.gz"
'make-ZyppCommon-cmake-module-includable.patch')
-sha256sums=('a50e6e4aa8dea822cbc3eb5c47815a864e4f95dc404728ef21639439fe4317ea'
+sha256sums=('6a86eef7dc1b6da5021ae032929e10038b7586f8edf8b2e3aeb40f44ee88927d'
'f5cdd85109c58d786f1124fa3cab1c5431a93a8d87a59117eac257c6e4698ae7')
prepare() {
@@ -23,21 +24,20 @@ prepare() {
}
build() {
- cd "${pkgname}-${pkgver}"
- mkdir -p build && cd build
cmake \
- -G Ninja \
- -D CMAKE_INSTALL_PREFIX=/usr \
- -D CMAKE_BUILD_TYPE=Release \
- -D LIB=/lib \
- -D ZYPP_PREFIX=/usr \
- ..
- ninja
+ -B build \
+ -S "${pkgname}-${pkgver}" \
+ -G Ninja \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D LIB=/lib \
+ -D ZYPP_PREFIX=/usr \
+
+ ninja -C build
}
package() {
- cd "${pkgname}-${pkgver}/build"
- DESTDIR="${pkgdir}/" ninja install
+ DESTDIR="${pkgdir}/" ninja -C build install
# hacky sbin symlink fix
mv "${pkgdir}"/usr/sbin/* "${pkgdir}/usr/bin/"