Version bump 7.4.0, move workdir to -common, fix build

1 files changed, 17 insertions, 17 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b42d29be69ed..86c5a4832b9f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,8 +7,8 @@
 pkgbase='bacula'
 _dir_backends=("${pkgbase}-dir-sqlite3" "${pkgbase}-dir-mariadb" "${pkgbase}-dir-postgresql")
 pkgname=("${pkgbase}-common" "${pkgbase}-console" "${pkgbase}-fd" "${pkgbase}-bat" "${pkgbase}-sd" "${pkgbase}-dir" ${_dir_backends[@]} "${pkgbase}-dir-mysql")
-pkgver=7.2.0
-pkgrel=2
+pkgver=7.4.0
+pkgrel=1
 arch=(i686 x86_64)
 pkgdesc="${pkgbase^} - A Network Backup Tool"
 url="http://www.${pkgbase}.org"
@@ -20,10 +20,10 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}-${pk
         '01-basename.patch'
        )
 
-md5sums=('8381b6523dab31648a0bae417e60832b'
+md5sums=('c290c505b51699201cc5e0adea01f2e0'
          '9ac88867a9ad3a4fe0486a26d0cdb542'
          '1b58f9bf9bfd047b15e8057e2028a96a')
-sha1sums=('5863afe6f438a03a70b02ee59446cb4e44359229'
+sha1sums=('6ccc405027e16ae09cbcf2059589dbcbaf5e739f'
           '58a60e8af9b4735c564c7223c2bf0c25803927f3'
           'ff9549b8ea326654bad5987c820f6dfd629fce54')
 
@@ -136,7 +136,7 @@ package_bacula-bat() {
   pkgdesc="${pkgdesc} (management GUI)"
   backup=("etc/${pkgbase}/bat.conf")
   depends=("${pkgbase}-common=${pkgver}" 'qt4')
-  install=("bacula.install")
+  install="bacula.install"
   pushd "${_instdir}"
 
   cp --parents -a usr/bin/bat ${pkgdir}
@@ -156,7 +156,7 @@ package_bacula-bat() {
 package_bacula-fd() {
   pkgdesc="${pkgdesc} (file daemon)"
   backup=("etc/${pkgbase}/${pkgname}.conf")
-  install=("bacula.install")
+  install="bacula.install"
   optdepends=(
     'openssl: network encryption between daemons'
     'lzo: LZO compression for Storage Daemon'
@@ -191,13 +191,16 @@ package_bacula-common() {
   cp --parents -a usr/share/man/man8/btraceback.8.gz ${pkgdir}
   #cp --parents -a usr/lib/libbacpy-${pkgver}.so ${pkgdir}
 
+  mkdir -p ${pkgdir}${_workdir}
+  mkdir -p ${pkgdir}/var/log/${pkgbase}
+
   popd
 }
 
 package_bacula-console() {
   pkgdesc="${pkgdesc} (management CLI)"
   backup=("etc/${pkgbase}/bconsole.conf")
-  install=("bacula.install")
+  install="bacula.install"
   depends=("${pkgbase}-common=${pkgver}")
   pushd "${_instdir}"
 
@@ -214,7 +217,7 @@ package_bacula-console() {
 package_bacula-dir() {
   pkgdesc="${pkgdesc} (Director)"
   depends=("${pkgbase}-common=${pkgver}")
-  install=("bacula.install")
+  install="bacula.install"
   optdepends=(
     "${pkgname}-sqlite3: SQLite support"
     "${pkgname}-mariadb: MariaDB support"
@@ -244,9 +247,6 @@ package_bacula-dir() {
   cp --parents -a usr/share/man/man8/dbcheck.8.gz ${pkgdir}
   cp --parents -a usr/lib/libbacsql-${pkgver}.so ${pkgdir}
 
-  mkdir -p ${pkgdir}${_workdir}
-  mkdir -p ${pkgdir}/var/log/${pkgbase}
-
   mkdir -p ${pkgdir}/usr/lib/systemd/system/
   cp -f ${srcdir}/${pkgname}.service ${pkgdir}/usr/lib/systemd/system/
 
@@ -267,9 +267,9 @@ package_bacula-dir-mariadb() {
   pkgdesc="${pkgdesc} (Director - MariaDB support)"
   depends=("${pkgbase}-dir" 'libmariadbclient')
   conflicts=(${_dir_backends[@]/${pkgname}})
-  install=("bacula.install")
-  replaces="${pkgbase}-dir-mysql"
-  provides="${pkgbase}-dir-mysql"
+  install="bacula.install"
+  replaces=("${pkgbase}-dir-mysql")
+  provides=("${pkgbase}-dir-mysql")
   pushd "${_instdir}"
 
   cp --parents -a usr/lib/libbaccats-mysql-${pkgver}.so ${pkgdir}
@@ -289,7 +289,7 @@ package_bacula-dir-mysql() {
 package_bacula-dir-postgresql() {
   pkgdesc="${pkgdesc} (Director - PostgreSQL support)"
   depends=("${pkgbase}-dir" 'postgresql-libs')
-  install=("bacula.install")
+  install="bacula.install"
   conflicts=(${_dir_backends[@]/${pkgname}})
   pushd "${_instdir}"
 
@@ -305,7 +305,7 @@ package_bacula-dir-sqlite3() {
   pkgdesc="${pkgdesc} (Director - SQLite3 support)"
   depends=("${pkgbase}-dir" 'sqlite')
   conflicts=(${_dir_backends[@]/${pkgname}})
-  install=("bacula.install")
+  install="bacula.install"
   pushd "${_instdir}"
 
   cp --parents -a usr/lib/libbaccats-sqlite3-${pkgver}.so ${pkgdir}
@@ -319,7 +319,7 @@ package_bacula-dir-sqlite3() {
 package_bacula-sd() {
   pkgdesc="${pkgdesc} (Storage Daemon)"
   backup=("etc/${pkgbase}/${pkgname}.conf")
-  install=("bacula.install")
+  install="bacula.install"
   depends=("${pkgbase}-common")
   optdepends=(
     'openssl: network encryption between daemons'