summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Spradling2017-05-05 21:58:20 -0400
committerMichael Spradling2017-05-05 21:58:20 -0400
commitd84e285e4fe30ed1044cb578db9734a6f9ad404f (patch)
tree1bba392f4ebd4af83de447fb6997d1eca29f83ab
parentf2fad5d650dd75d85e194a76333c1f825651ce17 (diff)
downloadaur-d84e285e4fe30ed1044cb578db9734a6f9ad404f.tar.gz
Workaround for bareos trying to install unbuilt ndmp files
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
-rw-r--r--PKGBUILD.common7
3 files changed, 9 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4398aafd803..5cbf1bc80a9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bareos
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced
pkgver = 16.2.5
- pkgrel = 1
+ pkgrel = 2
url = http://www.bareos.org
arch = i686
arch = x86_64
@@ -19,7 +19,7 @@ pkgbase = bareos
source = git+https://github.com/bareos/bareos.git#tag=Release/16.2.5
source = PKGBUILD.common
sha256sums = SKIP
- sha256sums = 44f533b3b0e52ac0cc6a296231bb1fd982b7ec523d44ecc1e72e38b285c19d41
+ sha256sums = fad5eef1cf2fd6b9802f082bce2803b3b3a0eadb58b5da9afea2484a068e134c
pkgname = bareos-common
pkgdesc = Bareos - Backup Archiving REcovery Open Sourced - Common files
diff --git a/PKGBUILD b/PKGBUILD
index 5d0e7580b17..7588b1875c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,4 +26,4 @@ source=("git+https://github.com/bareos/bareos.git#tag=Release/16.2.5"
"PKGBUILD.common")
sha256sums=('SKIP'
- '44f533b3b0e52ac0cc6a296231bb1fd982b7ec523d44ecc1e72e38b285c19d41')
+ 'fad5eef1cf2fd6b9802f082bce2803b3b3a0eadb58b5da9afea2484a068e134c')
diff --git a/PKGBUILD.common b/PKGBUILD.common
index 727831200dd..9b752287132 100644
--- a/PKGBUILD.common
+++ b/PKGBUILD.common
@@ -3,7 +3,7 @@
pkgver=16.2.5
_pkgver=16.2.5
-pkgrel=1
+pkgrel=2
arch=(i686 x86_64)
groups=('bareos')
pkgdesc="Bareos - Backup Archiving REcovery Open Sourced"
@@ -89,6 +89,11 @@ _install_files() {
continue
fi
+ #TODO: BUG 16.5 seems to have this in an install dir but doesn't build them
+ if [[ $file == *"ndmp"*.so ]]; then
+ continue
+ fi
+
if [[ $second == "" ]]; then
pushd $_instdir &> /dev/null
set -f