Merge branch 'release/8.0.27-fc35' into 8.0

Belongingtome47 · Oct 20, 2021 · 6e6e2cf · 6e6e2cf
2 parents 2d24b6b + 1bc5933
commit 6e6e2cf
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/backend/wbprivate/workbench/wb_module.cpp b/backend/wbprivate/workbench/wb_module.cpp
@@ -218,7 +218,7 @@ int WorkbenchImpl::isOsSupported(const std::string &os) {
     "Red Hat Enterprise Linux Server release 7", // Oracle 7.1 looks like this: "Red Hat Enterprise Linux Server release
                                                  // 7.1 (Maipo)"
     "Red Hat Enterprise Linux release 8",        // Oracle 8.0: Red Hat Enterprise Linux release 8.0 (Ootpa)
-    "Fedora release 33", "Fedora release 34", "CentOS release 7",
+    "Fedora release 34", "Fedora release 35", "CentOS release 7",
 
     "Windows 10", "Windows Server 2016", "Windows Server 2019",
 

diff --git a/build/mysql-workbench.spec.in b/build/mysql-workbench.spec.in
@@ -15,6 +15,11 @@
 # Enable use of "--with" and "--without" options to "rpmbuld"
 #
 
+# Temporarily disable the check-rpath run. It is enabled by default on
+# Fedora 35. It will complain about "ogr2ogr" and "ogrinfo" that
+# contains invalid RPATHS pointing to internal install directories
+%global __brp_check_rpaths %{nil}
+
 # Allow to continue when a binary with no build-id was found
 %undefine _missing_build_ids_terminate_build
 
@@ -51,7 +56,7 @@
 
 # FIXME change so that if not defined, this is a build building
 # against RPM installed libraries
-# %if %{defined bundles_path}
+# %%if %%{defined bundles_path}
 
 Summary: A MySQL visual database modeling, administration, development and migration tool
 Name   : mysql-workbench-%{edition}
@@ -104,22 +109,21 @@ BuildRequires: gdal-devel
 %if 0%{?rhel} == 7
 # Disable execution of automatic bytecompilation of python libs
 %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
-%if %{defined python_path}
-%define python_lib_path %{python_path}/lib/libpython3.7m.so
-%define python_inc_dir %{python_path}/include/python3.7m
-%else
-# if el7, and python_path is not specified
+%endif
+
+%if !%{defined python_lib_path} || !%{defined python_inc_dir}
+%if 0%{?rhel} == 7
+# if el7, and python_lib_path is not specified
 # then make sure python37-devel is installed
 BuildRequires: python37-devel
 %define python_lib_path /usr/lib/libpython3.7m.so
 %define python_inc_dir /usr/include/python3.7m
 %endif
-%endif
-
 %if 0%{?rhel} == 8
 %define python_lib_path /usr/lib64/libpython3.8.so
 %define python_inc_dir /usr/include/python3.8
 %endif
+%endif
 
 %if 0%{?fedora} >= 18
 BuildRequires: libuuid-devel
@@ -273,8 +277,8 @@ find %{buildroot}%{_libdir}/mysql-workbench -name \*.la -exec rm {} \; -print
 # If python path is specified that means we are using pb2 built
 # python and hence the python (.so) file needs to be bundled with
 # WB package.
-%if %{defined python_path}
-  cp -a %{python_path}/lib/libpython3.7m.so*            %{buildroot}%{_libdir}/mysql-workbench/
+%if %{defined python_lib_path}
+  cp -a %{python_lib_path}*                             %{buildroot}%{_libdir}/mysql-workbench/
 %endif
 
 %post

diff --git a/testing/test-suite/tests/backend/wbprivate/workbench/wb_module_specs.cpp b/testing/test-suite/tests/backend/wbprivate/workbench/wb_module_specs.cpp
@@ -134,8 +134,9 @@ namespace {
     $expect(isOsSupportedProxy("Fedora release 30 x86_64")).toBeFalse();
     $expect(isOsSupportedProxy("Fedora release 31 x86_64")).toBeFalse();
     $expect(isOsSupportedProxy("Fedora release 32 x86_64")).toBeFalse();
-    $expect(isOsSupportedProxy("Fedora release 33 x86_64")).toBeTrue();
+    $expect(isOsSupportedProxy("Fedora release 33 x86_64")).toBeFalse();
     $expect(isOsSupportedProxy("Fedora release 34 x86_64")).toBeTrue();
+    $expect(isOsSupportedProxy("Fedora release 35 x86_64")).toBeTrue();
   });
 }
 }