summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsl1pkn072015-11-22 16:14:52 +0100
committersl1pkn072015-11-22 16:14:52 +0100
commit8bcb61ec85f9a57252899c0dcd3ca48bd8673a09 (patch)
treedcd7161507a8a42b2284a018d054767521cdcc66
parent3ba7c39b0307ff0d2031010a6e7486f52d1f8859 (diff)
downloadaur-8bcb61ec85f9a57252899c0dcd3ca48bd8673a09.tar.gz
Add provides=()
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD6
2 files changed, 9 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ca36353984d8..f5ea9c6cb36d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = marble-git
pkgdesc = Desktop Globe. (GIT version)
- pkgver = 1.11.80.r10804.f59d559
+ pkgver = 1.12.20.r11049.8417b5d
pkgrel = 1
url = https://www.kde.org/applications/system/marble
arch = i686
@@ -43,6 +43,7 @@ pkgname = marble-git
optdepends = qextserialport-qt5: reading from serial port in APRS plugin
optdepends = libwlocate: Position information based on neighboring WLAN networks
optdepends = krunner: Krunner plugin for marble
+ provides = marble
conflicts = kdeedu-marble<15.04.3-3
conflicts = marble-qt
conflicts = marble
@@ -52,6 +53,7 @@ pkgname = marble-git
pkgname = libastro-git
pkgdesc = Marble astronomy library
depends = gcc-libs
+ provides = libastro
conflicts = kdeedu-marble<15.07
conflicts = marble-qt
conflicts = libastro
@@ -61,6 +63,7 @@ pkgname = marble-data-git
install = marble-git.install
arch = any
depends = hicolor-icon-theme
+ provides = marble-data
conflicts = kdeedu-marble<15.07
conflicts = marble<15.07.80-3
conflicts = marble-qt
diff --git a/PKGBUILD b/PKGBUILD
index 453a161a1002..1b0fc240a050 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=marble-git
pkgname=('marble-git'
'libastro-git'
'marble-data-git')
-pkgver=1.11.80.r10804.f59d559
+pkgver=1.12.20.r11049.8417b5d
pkgrel=1
pkgdesc="Desktop Globe. (GIT version)"
arch=('i686' 'x86_64')
@@ -47,6 +47,7 @@ prepare() {
-e '/Quick/d' \
-e '/touch/d' \
-i marble/src/apps/CMakeLists.txt
+
}
build() {
@@ -73,6 +74,7 @@ package_libastro-git() {
'marble-qt'
'libastro'
)
+ provides=('libastro')
make -C build/src/lib/astro DESTDIR="${pkgdir}" install
}
@@ -96,6 +98,7 @@ package_marble-git() {
'marble-qt'
'marble'
)
+ provides=('marble')
replaces=('kdeedu-marble'
'marble-qt<15.07'
)
@@ -123,6 +126,7 @@ package_marble-data-git() {
'marble-qt'
'marble-data'
)
+ provides=('marble-data')
install=marble-git.install
make -C build/data DESTDIR="${pkgdir}" install