build: stop mentioning python 2 in packages

bareos · Aug 24, 2023 · 3a96786 · 3a96786
1 parent 3286449
commit 3a96786
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 50 deletions.
diff --git a/core/cmake/BareosGenerateDebianInfo.cmake b/core/cmake/BareosGenerateDebianInfo.cmake
@@ -47,19 +47,15 @@ else()
      AND ENABLE_PYTHON
      AND (Python3_FOUND)
   )
-    if(Python3_FOUND)
-      list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-director-python3-plugin")
-    endif()
+    list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-director-python3-plugin")
     list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-director-python-plugins-common")
   endif()
 
   if(HAVE_GLUSTERFS)
     list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-filedaemon-glusterfs-plugin")
   endif()
   if(ENABLE_PYTHON AND Python3_FOUND)
-    if(Python3_FOUND)
-      list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-filedaemon-python3-plugin")
-    endif()
+    list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-filedaemon-python3-plugin")
     list(APPEND DEBIAN_CONTROL_SNIPPETS
          "bareos-filedaemon-python-plugins-common"
     )
@@ -75,9 +71,7 @@ else()
      AND ENABLE_PYTHON
      AND Python3_FOUND
   )
-    if(Python3_FOUND)
-      list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-storage-python3-plugin")
-    endif()
+    list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-storage-python3-plugin")
     list(APPEND DEBIAN_CONTROL_SNIPPETS "bareos-storage-python-plugins-common")
   endif()
 

diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -555,7 +555,7 @@ This package contains the python 3 plugin for the director daemon
 %description director-python-plugins-common
 %{dscr}
 
-This package contains the common files for the python 2 and python 3 director plugins.
+This package contains the common files for the python director plugins.
 
 %description filedaemon-python3-plugin
 %{dscr}
@@ -565,7 +565,7 @@ This package contains the python 3 plugin for the file daemon
 %description filedaemon-python-plugins-common
 %{dscr}
 
-This package contains the common files for the python 2 and python 3 filedaemon plugins.
+This package contains the common files for the python filedaemon plugins.
 
 %description filedaemon-ldap-python-plugin
 %{dscr}
@@ -606,7 +606,7 @@ This package contains the python 3 plugin for the storage daemon
 %description storage-python-plugins-common
 %{dscr}
 
-This package contains the common files for the python 2 and python 3 storage plugins.
+This package contains the common files for the python storage plugins.
 %endif
 
 %if 0%{?glusterfs}

diff --git a/debian/control b/debian/control
@@ -104,8 +104,8 @@ Description: Backup Archiving Recovery Open Sourced - client metapackage
 
 Package:        bareos-common
 Architecture:   any
-Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0, adduser
-Depends:        gawk, openssl, ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0, adduser, coreutils, findutils, grep, gawk, libc-bin, passwd, openssl, sed
+Depends:        ${shlibs:Depends}, ${misc:Depends}
 Conflicts:      bacula-director-common, bacula-common
 Description: Backup Archiving Recovery Open Sourced - common files
  Bareos is a set of programs to manage backup, recovery and verification of
@@ -273,7 +273,7 @@ Package:        bareos-director-python3-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-director-python-plugins-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-director (= ${binary:Version}), bareos-director-python-plugins-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides:       bareos-director-python-plugin (= ${binary:Version})
 Replaces:       bareos-director-python-plugin
 Conflicts:      bareos-director-python-plugin
@@ -293,14 +293,13 @@ Description: Backup Archiving Recovery Open Sourced - director Python plugin com
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
- This package provides common files for both Python 2 and Python 3 director plugins.
+ This package provides common files for both Python director plugins.
 
 Package:        bareos-contrib-director-python-plugins
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-director-python-plugin (= ${binary:Version}), ${misc:Depends}
-Recommends:     bareos-director-python3-plugin
+Depends:        bareos-common (= ${binary:Version}), bareos-director-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - contributed Director plugins
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -312,7 +311,7 @@ Package:        bareos-filedaemon-python3-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugins-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:        bareos-filedaemon (= ${binary:Version}), bareos-filedaemon-python-plugins-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Recommends:     python3-dateutil
 Provides:       bareos-filedaemon-python-plugin (= ${binary:Version})
 Replaces:       bareos-filedaemon-python-plugin
@@ -333,13 +332,13 @@ Description: Backup Archiving Recovery Open Sourced - file daemon Python plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
- This package provides common files for both Python 2 and Python 3 filedaemon plugins.
+ This package provides common files for Python filedaemon plugins.
 
 Package:        bareos-filedaemon-ldap-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python2-plugin (= ${binary:Version}), python-ldap, ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), python-ldap, ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon LDAP plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -350,8 +349,7 @@ Package:        bareos-filedaemon-percona-xtrabackup-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${misc:Depends}
-Recommends:     bareos-filedaemon-python3-plugin
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon Percona XtraBackup plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -362,8 +360,7 @@ Package:        bareos-filedaemon-mariabackup-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${misc:Depends}
-Recommends:     bareos-filedaemon-python3-plugin
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon Mariabackup plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -374,8 +371,7 @@ Package:        bareos-filedaemon-postgresql-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${misc:Depends}
-Recommends:     bareos-filedaemon-python3-plugin
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon PostgreSQL plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -386,8 +382,7 @@ Package:        bareos-filedaemon-libcloud-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${misc:Depends}
-Recommends:     bareos-filedaemon-python3-plugin
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon Apache Libcloud plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -398,8 +393,7 @@ Package:        bareos-contrib-filedaemon-python-plugins
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python-plugin (= ${binary:Version}), ${misc:Depends}
-Recommends:     bareos-filedaemon-python3-plugin
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - contributed File Daemon plugins
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -422,7 +416,7 @@ Package:        bareos-storage-python3-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-storage-python-plugins-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-storage (= ${binary:Version}), bareos-storage-python-plugins-common (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Provides:       bareos-storage-python-plugin (= ${binary:Version})
 Replaces:       bareos-storage-python-plugin
 Conflicts:      bareos-storage-python-plugin
@@ -442,7 +436,7 @@ Description: Backup Archiving Recovery Open Sourced - storage daemon Python plug
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
- This package provides common files for both Python 2 and Python 3 storagedaemon plugins.
+ This package provides common files for Python storagedaemon plugins.
 
 
 Package:        bareos-traymonitor

diff --git a/debian/control.bareos-director-python-plugins-common b/debian/control.bareos-director-python-plugins-common
@@ -7,13 +7,13 @@ Description: Backup Archiving Recovery Open Sourced - director Python plugin com
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
- This package provides common files for both Python 2 and Python 3 director plugins.
+ This package provides common files for both Python director plugins.
 
 Package:        bareos-contrib-director-python-plugins
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-director-python3-plugin (= ${binary:Version}) | bareos-director-python2-plugin (= ${binary:Version}), ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-director-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - contributed Director plugins
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.

diff --git a/debian/control.bareos-filedaemon-python-plugins-common b/debian/control.bareos-filedaemon-python-plugins-common
@@ -7,13 +7,13 @@ Description: Backup Archiving Recovery Open Sourced - file daemon Python plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
- This package provides common files for both Python 2 and Python 3 filedaemon plugins.
+ This package provides common files for Python filedaemon plugins.
 
 Package:        bareos-filedaemon-ldap-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python2-plugin (= ${binary:Version}), python-ldap, ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), python-ldap, ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon LDAP plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -24,7 +24,7 @@ Package:        bareos-filedaemon-percona-xtrabackup-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}) | bareos-filedaemon-python2-plugin (= ${binary:Version}), ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon Percona XtraBackup plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -35,7 +35,7 @@ Package:        bareos-filedaemon-mariabackup-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}) | bareos-filedaemon-python2-plugin (= ${binary:Version}), ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon Mariabackup plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -46,7 +46,7 @@ Package:        bareos-filedaemon-postgresql-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}) | bareos-filedaemon-python2-plugin (= ${binary:Version}), ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon PostgreSQL plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -57,7 +57,7 @@ Package:        bareos-filedaemon-libcloud-python-plugin
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}) | bareos-filedaemon-python2-plugin (= ${binary:Version}), ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - file daemon Apache Libcloud plugin
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
@@ -68,7 +68,7 @@ Package:        bareos-contrib-filedaemon-python-plugins
 Architecture:   any
 Section:        python
 Pre-Depends:    debconf (>= 1.4.30) | debconf-2.0
-Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}) | bareos-filedaemon-python2-plugin (= ${binary:Version}), ${misc:Depends}
+Depends:        bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}), ${misc:Depends}
 Description: Backup Archiving Recovery Open Sourced - contributed File Daemon plugins
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.

diff --git a/debian/control.bareos-storage-python-plugins-common b/debian/control.bareos-storage-python-plugins-common
@@ -7,4 +7,4 @@ Description: Backup Archiving Recovery Open Sourced - storage daemon Python plug
  Bareos is a set of programs to manage backup, recovery and verification of
  data across a network of computers of different kinds.
  .
- This package provides common files for both Python 2 and Python 3 storagedaemon plugins.
+ This package provides common files for Python storagedaemon plugins.
diff --git a/debian/control.vmware b/debian/control.vmware
@@ -1,6 +1,6 @@
 Package: bareos-vmware-plugin
 Architecture: any
-Depends: bareos-vadp-dumper (= ${binary:Version}), bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version}) | bareos-filedaemon-python2-plugin (= ${binary:Version})
+Depends: bareos-vadp-dumper (= ${binary:Version}), bareos-common (= ${binary:Version}), bareos-filedaemon-python3-plugin (= ${binary:Version})
 Description: Bareos VMware plugin
  Uses the VMware API to take snapshots of running VMs and takes
  full and incremental backup so snapshots. Restore of a snapshot

diff --git a/python-bareos/packaging/python-bareos.spec b/python-bareos/packaging/python-bareos.spec
@@ -55,18 +55,13 @@ BuildRequires:  %{python3_build_requires}
 %prep
 %setup -q
 
-%build
 
-%if ! 0%{?skip_python3}
+%build
 %py3_build
-%endif
 
 
 %install
-
-%if ! 0%{?skip_python3}
 %py3_install
-%endif
 
 
 %check