summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorYurii Kolesnykov2022-05-19 04:54:09 +0300
committerYurii Kolesnykov2022-05-19 04:54:09 +0300
commit0246907ecfc679c423f6eb9f435e7bec06206b67 (patch)
tree4de40b36744ec22556745e17483186120d4b88e1
parent047984660d71d4b279f430122eda97e7f2b8e4f8 (diff)
downloadaur-0246907ecfc679c423f6eb9f435e7bec06206b67.tar.gz
sync with aur/zypper
Signed-off-by: Yurii Kolesnykov <root@yurikoles.com>
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD39
2 files changed, 19 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 803d52553643..4395f44aae8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = zypper-git
pkgdesc = World's most powerful command line package manager
- pkgver = 1.14.50.9.g7d1549bf
+ pkgver = 1.14.52.37.g01e16dc9
pkgrel = 1
- url = https://github.com/openSUSE/zypper
+ url = http://en.opensuse.org/Portal:Zypper
arch = x86_64
license = GPL
makedepends = asciidoc
@@ -10,12 +10,10 @@ pkgbase = zypper-git
makedepends = boost
makedepends = cmake
makedepends = git
- makedepends = ninja
depends = augeas
depends = libzypp
depends = perl
depends = procps
- depends = protobuf
provides = zypper
provides = apt
conflicts = zypper
diff --git a/PKGBUILD b/PKGBUILD
index ca5b266ee58a..b92b7c7f2b48 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,17 @@
_pkgname=zypper
pkgname=${_pkgname}-git
-pkgver=1.14.50.9.g7d1549bf
+pkgver=1.14.52.37.g01e16dc9
pkgrel=1
pkgdesc="World's most powerful command line package manager"
arch=('x86_64')
-url="https://github.com/openSUSE/${_pkgname}"
+url='http://en.opensuse.org/Portal:Zypper'
license=('GPL')
depends=(
'augeas'
'libzypp'
'perl'
'procps'
- 'protobuf'
)
makedepends=(
'asciidoc'
@@ -21,19 +20,11 @@ makedepends=(
'boost'
'cmake'
'git'
- 'ninja'
)
-provides=(
- "${_pkgname}"
- 'apt'
-)
-conflicts=(
- "${_pkgname}"
- 'apt'
-)
-source=(
- "${pkgname}::git+https://github.com/openSUSE/${_pkgname}.git"
- 'make-ZyppCommon-cmake-module-includable.patch')
+provides=("${_pkgname}" 'apt')
+conflicts=("${provides[@]}")
+source=("${pkgname}::git+https://github.com/openSUSE/${_pkgname}.git"
+ 'make-ZyppCommon-cmake-module-includable.patch')
sha256sums=('SKIP'
'f5cdd85109c58d786f1124fa3cab1c5431a93a8d87a59117eac257c6e4698ae7')
@@ -49,17 +40,21 @@ prepare() {
build() {
cmake \
- -B build \
- -S "${pkgname}" \
- -G Ninja \
- -D CMAKE_INSTALL_PREFIX=/usr \
- -D CMAKE_BUILD_TYPE=Release \
- -D LIB=lib \
- -D ZYPP_PREFIX=/usr \
+ -B build \
+ -S "${pkgname}" \
+ -D CMAKE_INSTALL_PREFIX=/usr \
+ -D CMAKE_BUILD_TYPE=Release \
+ -D LIB=lib \
+ -D ZYPP_PREFIX=/usr \
+ -D ENABLE_BUILD_TESTS=ON
cmake --build build
}
+check() {
+ ctest --test-dir build
+}
+
package() {
DESTDIR="${pkgdir}" cmake --install build