summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Spradling2015-11-30 21:51:23 -0500
committerMichael Spradling2015-11-30 21:52:08 -0500
commit38c825d8b7adee258ff021d76d7d1ba8bd92a143 (patch)
tree286e357e16b9c4d22ad75377bf58b5dd3f06be4d
parent684064128d095e7a4838e6f332ca465f7f5c19a2 (diff)
downloadaur-38c825d8b7adee258ff021d76d7d1ba8bd92a143.tar.gz
bareos-bat now conflicts with alsa-utils since 1.1
bareos tarball sha256 changes. Why?
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD4
-rw-r--r--PKGBUILD.common3
3 files changed, 7 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2647bf27476..68db837d660 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 73b9f3f3601..89c176e1212 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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 d7bb1e9df3a..251ae82f02d 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')