summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2018-12-12 13:02:02 +0100
committerYurii Kolesnykov2018-12-12 13:02:02 +0100
commit59b61e9ad6741cc0d07a6e389223588b8227a686 (patch)
tree838244ba398752f6e96e3c338877e36458a4d022
parentedd0eddaada6e58f9329ff2290fd93f3e37fa05d (diff)
downloadaur-59b61e9ad6741cc0d07a6e389223588b8227a686.tar.gz
1.14.17
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD20
2 files changed, 16 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d3375cdceab5..fee35a5311e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zypper
pkgdesc = Command line software manager using libzypp
- pkgver = 1.14.17
+ pkgver = 1.14.18
pkgrel = 1
url = https://github.com/openSUSE/zypper
arch = i686
@@ -8,6 +8,7 @@ pkgbase = zypper
license = GPL
makedepends = git
makedepends = cmake
+ makedepends = ninja
makedepends = boost
makedepends = asciidoc
depends = libzypp
@@ -18,9 +19,9 @@ pkgbase = zypper
provides = zypper
provides = apt
conflicts = apt
- source = https://github.com/openSUSE/zypper/archive/1.14.17.tar.gz
+ source = https://github.com/openSUSE/zypper/archive/1.14.18.tar.gz
source = make-ZyppCommon-cmake-module-includable.patch
- sha256sums = 9a1f74b4700e5bc547c22eb9351fb09017f9153ce987084f4664bface096e844
+ sha256sums = feb3ac9572ac40e456cecee34cdb69a70236c0242f23b9498d3f68326eacb624
sha256sums = f5cdd85109c58d786f1124fa3cab1c5431a93a8d87a59117eac257c6e4698ae7
pkgname = zypper
diff --git a/PKGBUILD b/PKGBUILD
index 84c8b24d057f..0093e551ebf8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,19 @@
# Maintainer: Yurii Kolesnykov <root@yurikoles.com>
pkgname=zypper
-pkgver=1.14.17
+pkgver=1.14.18
pkgrel=1
pkgdesc="Command line software manager using libzypp"
arch=('i686' 'x86_64')
url="https://github.com/openSUSE/zypper"
license=('GPL')
depends=('libzypp' 'libxml2' 'procps' 'readline' 'augeas')
-makedepends=('git' 'cmake' 'boost' 'asciidoc')
+makedepends=('git' 'cmake' 'ninja' 'boost' 'asciidoc')
provides=('zypper' 'apt')
conflicts=('apt')
source=("https://github.com/openSUSE/zypper/archive/${pkgver}.tar.gz"
'make-ZyppCommon-cmake-module-includable.patch')
-sha256sums=('9a1f74b4700e5bc547c22eb9351fb09017f9153ce987084f4664bface096e844'
+sha256sums=('feb3ac9572ac40e456cecee34cdb69a70236c0242f23b9498d3f68326eacb624'
'f5cdd85109c58d786f1124fa3cab1c5431a93a8d87a59117eac257c6e4698ae7')
@@ -24,17 +24,21 @@ prepare() {
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- cmake -D CMAKE_INSTALL_PREFIX=/usr \
+ 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 \
- .
- make
+ ..
+ ninja
}
package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="$pkgdir/" install
+ cd "${srcdir}/${pkgname}-${pkgver}/build"
+ DESTDIR="$pkgdir/" ninja install
# hacky sbin symlink fix
mv $pkgdir/usr/sbin/* $pkgdir/usr/bin/