adjusted provides/conflict to provide a smooth upgrade process

This commit is contained in:
AlmAck 2017-01-01 20:46:37 +00:00
parent 689702ec81
commit fb083c4892
4 changed files with 7 additions and 5 deletions

View File

@ -3,7 +3,7 @@ source ../kdeapps.conf
pkgname=keditbookmarks pkgname=keditbookmarks
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=1 pkgrel=2
pkgdesc="Bookmark Organizer and Editor" pkgdesc="Bookmark Organizer and Editor"
arch=(x86_64) arch=(x86_64)
url="https://www.kde.org/" url="https://www.kde.org/"
@ -12,6 +12,7 @@ depends=(kparts)
makedepends=(extra-cmake-modules python3 kdoctools) makedepends=(extra-cmake-modules python3 kdoctools)
conflicts=(kde-baseapps-keditbookmarks) conflicts=(kde-baseapps-keditbookmarks)
replaces=(kde-baseapps-keditbookmarks) replaces=(kde-baseapps-keditbookmarks)
provides=(kde-baseapps-keditbookmarks)
options=(docs debug) options=(docs debug)
groups=(kde kde-uninstall kde-applications kde-baseapps) groups=(kde kde-uninstall kde-applications kde-baseapps)
source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig}) source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig})

View File

@ -3,14 +3,13 @@ source ../kdeapps.conf
pkgname=kmail-account-wizard pkgname=kmail-account-wizard
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=1 pkgrel=2
pkgdesc="KMail account wizard" pkgdesc="KMail account wizard"
arch=(x86_64) arch=(x86_64)
url="https://community.kde.org/KDE_PIM" url="https://community.kde.org/KDE_PIM"
license=(GPL2) license=(GPL2)
depends=(knotifyconfig ktexteditor kross mailcommon) depends=(knotifyconfig ktexteditor kross mailcommon)
makedepends=(extra-cmake-modules boost python3 kdoctools qt5-tools) makedepends=(extra-cmake-modules boost python3 kdoctools qt5-tools)
conflicts=(kdepim-common)
options=(docs debug) options=(docs debug)
groups=(kde kde-uninstall kde-applications kdepim) groups=(kde kde-uninstall kde-applications kdepim)
source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig}) source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig})

View File

@ -3,7 +3,7 @@ source ../kdeapps.conf
pkgname=kmail pkgname=kmail
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=1 pkgrel=2
pkgdesc="KDE mail client" pkgdesc="KDE mail client"
arch=(x86_64) arch=(x86_64)
url="https://community.kde.org/KDE_PIM" url="https://community.kde.org/KDE_PIM"
@ -14,6 +14,7 @@ makedepends=(extra-cmake-modules kdoctools kdesignerplugin boost python3)
optdepends=('kleopatra: mail encryption support' 'kdepim-addons: additional plugins') optdepends=('kleopatra: mail encryption support' 'kdepim-addons: additional plugins')
conflicts=(ktnef) conflicts=(ktnef)
replaces=(ktnef) replaces=(ktnef)
provides=(ktnef)
options=(docs debug) options=(docs debug)
groups=(kde kde-uninstall kde-applications kdepim) groups=(kde kde-uninstall kde-applications kdepim)
source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig}) source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig})

View File

@ -3,7 +3,7 @@ source ../kdeapps.conf
pkgname=konqueror pkgname=konqueror
pkgver=${_kdever} pkgver=${_kdever}
pkgrel=1 pkgrel=2
pkgdesc="KDE File Manager & Web Browser" pkgdesc="KDE File Manager & Web Browser"
arch=(x86_64) arch=(x86_64)
url="https://konqueror.org/" url="https://konqueror.org/"
@ -13,6 +13,7 @@ makedepends=(extra-cmake-modules kdoctools python3 tidyhtml kdesignerplugin kdes
optdepends=('tidyhtml: tidy HTML plugin' 'kdesu: shell command plugin') optdepends=('tidyhtml: tidy HTML plugin' 'kdesu: shell command plugin')
conflicts=(kde-baseapps-konqueror kde-baseapps-konq-plugins dolphinpart4) conflicts=(kde-baseapps-konqueror kde-baseapps-konq-plugins dolphinpart4)
replaces=(kde-baseapps-konqueror kde-baseapps-konq-plugins dolphinpart4) replaces=(kde-baseapps-konqueror kde-baseapps-konq-plugins dolphinpart4)
provides=(kde-baseapps-konqueror kde-baseapps-konq-plugins dolphinpart4)
options=(docs debug) options=(docs debug)
groups=(kde kde-uninstall kde-applications kde-baseapps) groups=(kde kde-uninstall kde-applications kde-baseapps)
source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig}) source=("$_mirror/${pkgname}-$_kdever.tar.xz"{,.sig})