Kolab Groupware OBS

Changes of Revision 66

libkolabxml.spec Changed

@@ -12,12 +12,18 @@
 %endif
 %global with_java 1
 %global with_php 1
+%if 0%{?rhel} >= 9
+%global with_python 0
+%else
 %global with_python 1
+%endif
 %global with_python3 1
 
-%{expand: %(if  `php-config --vernum` -gt 70000 ; then echo %%global with_php7 1; else echo %%global with_php7 0; fi)}
 
 %if 0%{?with_php} > 0
+
+%{expand: %(if  `php-config --vernum` -gt 70000 ; then echo %%global with_php7 1; else echo %%global with_php7 0; fi)}
+
 %if 0%{?suse_version}
 %global php php5
 %{!?php_extdir: %global php_extdir %{_libdir}/php5/extensions}
@@ -102,9 +108,9 @@
 BuildRequires:  xerces-c-devel
 %endif
 
+# For running zonetabconversion.py
 %if 0%{?rhel} >= 8 || 0%{?fedora}
-BuildRequires:  python3-devel
-BuildRequires:  python36
+BuildRequires:  python3
 %else
 BuildRequires:  python
 %endif
@@ -458,6 +464,8 @@
 %endif
     -DBUILD_SHARED_LIBS:BOOL=ON \
 %else # if 0${?suse_version}
+# The cmake macro changed to build out of source by default, which breaks our own out of source build, so disable that.
+%define __cmake_in_source_build 1
 %cmake \
 %endif
     -DBoost_NO_BOOST_CMAKE=TRUE \