diff options
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | PKGBUILD.common | 3 |
3 files changed, 7 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = bareos pkgdesc = Bareos - Backup Archiving REcovery Open Sourced pkgver = 15.2.2 - pkgrel = 1 + pkgrel = 2 url = http://www.bareos.org arch = i686 arch = x86_64 @@ -16,8 +16,8 @@ pkgbase = bareos optdepends = openssl: network encryption between daemons source = https://github.com/bareos/bareos/archive/Release/15.2.2.tar.gz source = PKGBUILD.common - sha256sums = e8f5b2c8635985abce68b057585db9d2b7abf3e394bc2b34cb3fbd6ebfed6d3b - sha256sums = 775965c5bf3c1f033da706a055625ff0de38e2f09d17d460bb290b53ad31dee7 + sha256sums = 7c7e07c877956385870475382184d39df7232ecd9791c3a3942624473410da93 + sha256sums = 8153e56e839ec2ceea275a3e49f0302994a8f5875b062f0f46c8e4df89b5a9e8 pkgname = bareos-common pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Common files @@ -25,5 +25,5 @@ pkgname=("${pkgbase}-common" source=("https://github.com/bareos/bareos/archive/Release/${pkgver}.tar.gz" "PKGBUILD.common") -sha256sums=('e8f5b2c8635985abce68b057585db9d2b7abf3e394bc2b34cb3fbd6ebfed6d3b' - '775965c5bf3c1f033da706a055625ff0de38e2f09d17d460bb290b53ad31dee7') +sha256sums=('7c7e07c877956385870475382184d39df7232ecd9791c3a3942624473410da93' + '8153e56e839ec2ceea275a3e49f0302994a8f5875b062f0f46c8e4df89b5a9e8') diff --git a/PKGBUILD.common b/PKGBUILD.common index d7bb1e9df3a0..251ae82f02dd 100644 --- a/PKGBUILD.common +++ b/PKGBUILD.common @@ -2,7 +2,7 @@ # Contributor: Daniel Albers <daniel@lbe.rs> pkgver=15.2.2 -pkgrel=1 +pkgrel=2 arch=(i686 x86_64) groups=('bareos') pkgdesc="Bareos - Backup Archiving REcovery Open Sourced" @@ -118,6 +118,7 @@ _etc_files() { package_bareos-bat() { + conflicts=("alsa-utils") pkgdesc="${pkgdesc} - Admin Tool (GUI)" depends=("bareos-common=$pkgver" "qt4") makedepends+=('qt4') |