fix cp_pkgdir

2 files changed, 13 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f7feb2d6a264..84e7630750a3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = bareos
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced
 	pkgver = 22.0.1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.bareos.org
 	arch = i686
 	arch = x86_64
@@ -14,9 +14,7 @@ pkgbase = bareos
 	makedepends = libmariadbclient
 	makedepends = postgresql-libs
 	makedepends = python
-	makedepends = python2
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	makedepends = rpcsvc-proto
 	makedepends = git
 	makedepends = lsb-release
@@ -105,16 +103,6 @@ pkgname = bareos-director-python-plugins-common
 	arch = any
 	depends = bareos-director=22.0.1
 
-pkgname = bareos-director-python2-plugin
-	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for director daemon
-	depends = bareos-director=22.0.1
-	depends = bareos-director-python-plugins-common=22.0.1
-	depends = python2
-	depends = libcap
-	depends = jansson
-	depends = lzo
-	conflicts = bareos-director-python-plugin
-
 pkgname = bareos-director-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for director daemon
 	depends = bareos-director=22.0.1
@@ -174,16 +162,6 @@ pkgname = bareos-filedaemon-python-plugins-common
 	arch = any
 	depends = bareos-filedaemon=22.0.1
 
-pkgname = bareos-filedaemon-python2-plugin
-	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for file daemon
-	depends = bareos-filedaemon=22.0.1
-	depends = bareos-filedaemon-python-plugins-common=22.0.1
-	depends = python2
-	depends = libcap
-	depends = lzo
-	depends = jansson
-	conflicts = bareos-filedaemon-python-plugin
-
 pkgname = bareos-filedaemon-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for file daemon
 	depends = bareos-filedaemon=22.0.1
@@ -227,16 +205,6 @@ pkgname = bareos-storage-python-plugins-common
 	arch = any
 	depends = bareos-storage=22.0.1
 
-pkgname = bareos-storage-python2-plugin
-	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for storage daemon
-	depends = bareos-storage=22.0.1
-	depends = bareos-storage-python-plugins-common=22.0.1
-	depends = python2
-	depends = lzo
-	depends = libcap
-	depends = jansson
-	conflicts = bareos-storage-python-plugin
-
 pkgname = bareos-storage-python3-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Python plugin for storage daemon
 	depends = bareos-storage=22.0.1
@@ -282,9 +250,6 @@ pkgname = bareos-traymonitor
 	depends = bareos-common=22.0.1
 	backup = etc/bareos/tray-monitor.d/monitor/bareos-mon.conf
 
-pkgname = bareos-vadp-dumper
-	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - vStorage APIs for Data Protection Dumper program
-
 pkgname = bareos-vmware-plugin
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Bareos VMware plugin
 	arch = any
@@ -293,9 +258,6 @@ pkgname = bareos-vmware-plugin
 	optdepends = bareos-filedaemon-python3-plugin=22.0.1
 	optdepends = bareos-filedaemon-python2-plugin=22.0.1
 
-pkgname = bareos-vmware-vix-disklib
-	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - VMware vix disklib distributable libraries
-
 pkgname = bareos-webui
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Webui (Bareos web administration)
 	depends = php7
@@ -305,7 +267,7 @@ pkgname = bareos-webui
 	backup = etc/bareos-webui/configuration.ini
 	backup = etc/bareos/bareos-dir.d/console/admin.conf.example
 	backup = etc/bareos/bareos-dir.d/profile/webui-admin.conf
-	backup = etc/httpd/conf/extra/bareos-webui.conf
+	backup = etc/httpd/conf.d/bareos-webui.conf
 
 pkgname = bareos-devel
 	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - Devel headers
@@ -316,10 +278,3 @@ pkgname = python-bareos
 	depends = python
 	depends = python-sslpsk
 	depends = jansson
-
-pkgname = python2-bareos
-	pkgdesc = Bareos - Backup Archiving Recovery Open Sourced - python-bareos is a Python2 module to access a backup system.
-	depends = python2
-	depends = python2-sslpsk
-	depends = jansson
-	conflicts = python-bareos
diff --git a/PKGBUILD b/PKGBUILD
index 3a65accfba33..ee92dcdb56b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,6 @@ pkgname=("bareos-bconsole"
          "bareos-database-postgresql"
          "bareos-database-tools"
          "bareos-director-python-plugins-common"
-         "bareos-director-python2-plugin"
          "bareos-director-python3-plugin"
          "bareos-director"
          "bareos-filedaemon-glusterfs-plugin"
@@ -23,14 +22,12 @@ pkgname=("bareos-bconsole"
          "bareos-filedaemon-percona-xtrabackup-python-plugin"
          "bareos-filedaemon-postgresql-python-plugin"
          "bareos-filedaemon-python-plugins-common"
-         "bareos-filedaemon-python2-plugin"
          "bareos-filedaemon-python3-plugin"
          "bareos-filedaemon"
          "bareos-storage-droplet"
          "bareos-storage-fifo"
          "bareos-storage-glusterfs"
          "bareos-storage-python-plugins-common"
-         "bareos-storage-python2-plugin"
          "bareos-storage-python3-plugin"
          "bareos-storage-tape"
          "bareos-storage"
@@ -40,20 +37,25 @@ pkgname=("bareos-bconsole"
          "bareos-webui"
          "bareos-devel"
          "python-bareos"
-         "python2-bareos"
          )
+
+#         "bareos-director-python2-plugin"
+#         "bareos-filedaemon-python2-plugin"
+#         "bareos-storage-python2-plugin"
+#         "python2-bareos"
 #         "bareos-vadp-dumper"
 #         "bareos-vmware-vix-disklib"
 
 pkgver=22.0.1
 pkgmajor=${pkgver%%.*}
-pkgrel=1
+pkgrel=2
 arch=(i686 x86_64 armv7h aarch64)
 groups=('bareos')
 pkgdesc="Bareos - Backup Archiving Recovery Open Sourced"
 url="http://www.bareos.org"
 license=('AGPL3')
-makedepends=('cmake' 'gcc' 'libmariadbclient' 'postgresql-libs' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'rpcsvc-proto' 'git' 'lsb-release' 'qt5-base' 'glusterfs' 'jansson' 'pam_wrapper')
+makedepends=('cmake' 'gcc' 'libmariadbclient' 'postgresql-libs' 'python' 'python-setuptools' 'rpcsvc-proto' 'git' 'lsb-release' 'qt5-base' 'glusterfs' 'jansson' 'pam_wrapper')
+#makedepends=('cmake' 'gcc' 'libmariadbclient' 'postgresql-libs' 'python' 'python2' 'python-setuptools' 'python2-setuptools' 'rpcsvc-proto' 'git' 'lsb-release' 'qt5-base' 'glusterfs' 'jansson' 'pam_wrapper')
 source=("git+https://github.com/bareos/bareos.git#tag=Release/${pkgver}"
         "0001-distver.patch"
         "0002-logspam.patch"
@@ -69,7 +71,7 @@ md5sums=('SKIP'
          '33d9c3a1d25b30ac2182aa8d874e28a5'
          'e78b88f897cfc3e60129eec360521e3d')
 python3_ver="3.10"
-python2_ver="2.7"
+#python2_ver="2.7"
 
 #=========================================
 prepare() {
@@ -134,7 +136,7 @@ build() {
 
   cd "${srcdir}/${pkgbase}/python-bareos"
   python setup.py build
-  python2 setup.py build
+  #python2 setup.py build
 }
 
 #=========================================
@@ -160,7 +162,7 @@ cp_pkgdir() {
          echo -e "\033[41mError:\033[0m missing $2/$n";
          return
       fi
-      files=`find $2/$n -type f`
+      files=`find $2/$n -type f,l`
       for f in $files \
       ; do
          new_dir=$(dirname $pkgdir`echo "$f" | sed "s|$2||"`)