diff options
| author | Michael Spradling | 2015-12-15 14:21:00 -0500 |
|---|---|---|
| committer | Michael Spradling | 2015-12-15 14:21:00 -0500 |
| commit | 4ad1743180bdd1ce2bd6b7bda586ec5aba087470 (patch) | |
| tree | c4988147363f4b9e51982e78d9ce1692c0b28fe1 | |
| parent | 24045dec28e7ce70713c59adc4e366f3059a5af2 (diff) | |
| download | aur-4ad1743180bdd1ce2bd6b7bda586ec5aba087470.tar.gz | |
Removed conflict from alsa-utils, renamed bat
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | PKGBUILD.common | 7 |
3 files changed, 8 insertions, 5 deletions
@@ -1,7 +1,7 @@ pkgbase = bareos pkgdesc = Bareos - Backup Archiving REcovery Open Sourced pkgver = 15.2.2 - pkgrel = 2 + pkgrel = 3 url = http://www.bareos.org arch = i686 arch = x86_64 @@ -17,7 +17,7 @@ pkgbase = bareos source = https://github.com/bareos/bareos/archive/Release/15.2.2.tar.gz source = PKGBUILD.common sha256sums = f314e7d3e99e92b4261af97888ddcdaaedf513b638745b07270db3e6930e9008 - sha256sums = 8153e56e839ec2ceea275a3e49f0302994a8f5875b062f0f46c8e4df89b5a9e8 + sha256sums = 9af9acc9b3981c92cb0edaaf9b3b1453039d4f8d18042a7697872fb56d9003ae pkgname = bareos-common pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Common files @@ -26,4 +26,4 @@ source=("https://github.com/bareos/bareos/archive/Release/${pkgver}.tar.gz" "PKGBUILD.common") sha256sums=('f314e7d3e99e92b4261af97888ddcdaaedf513b638745b07270db3e6930e9008' - '8153e56e839ec2ceea275a3e49f0302994a8f5875b062f0f46c8e4df89b5a9e8') + '9af9acc9b3981c92cb0edaaf9b3b1453039d4f8d18042a7697872fb56d9003ae') diff --git a/PKGBUILD.common b/PKGBUILD.common index 251ae82f02dd..f71aebf48148 100644 --- a/PKGBUILD.common +++ b/PKGBUILD.common @@ -2,7 +2,7 @@ # Contributor: Daniel Albers <daniel@lbe.rs> pkgver=15.2.2 -pkgrel=2 +pkgrel=3 arch=(i686 x86_64) groups=('bareos') pkgdesc="Bareos - Backup Archiving REcovery Open Sourced" @@ -118,13 +118,16 @@ _etc_files() { package_bareos-bat() { - conflicts=("alsa-utils") pkgdesc="${pkgdesc} - Admin Tool (GUI)" depends=("bareos-common=$pkgver" "qt4") makedepends+=('qt4') backup=(`_etc_files ${pkgname}.install`) install=bareos-bat.install _install_files ${pkgname} + + # Temp, while waiting on bug: https://bugs.bareos.org/view.php?id=576 + mv ${pkgdir}/usr/bin/bat ${pkgdir}/usr/bin/bareos-bat + mv ${pkgdir}/usr/share/man/man1/bat.1.gz ${pkgdir}/usr/share/man/man1/bareos-bat.1.gz } package_bareos-bconsole() { |