Request 3071 (accepted)

This request supersedes: request 3069 (Show diff)

Overview

Request 3071 (accepted)

Build on centos 9 stream

Created by mollekopf over 1 year ago
In state accepted
Supersedes 3069
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit libkolab

Submit package Kolab:16:Testing / libkolab to package Kolab:16 / libkolab

libkolab.spec Changed

@@ -4,6 +4,9 @@
 #!BuildIgnore:  httpd
 %endif
 
+# 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
+
 %{expand: %(if  `php-config --vernum` -gt 70000 ; then echo %%global with_php7 1; else echo %%global with_php7 0; fi)}
 
 %if 0%{?suse_version}
@@ -18,6 +21,11 @@
 %{!?php_apiver: %global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}
 
 
+%if 0%{?rhel} > 8
+%global with_python 0
+%else
+%global with_python 1
+%endif
 %global with_python3 1
 
 %{?filter_setup:
@@ -254,6 +262,10 @@
 popd
 %endif
 
+%if 0%{?with_python}
+cp -a libkolab-%{version} libkolab-%{version}-python
+%endif
+
 %if 0%{?with_python3}
 cp -a libkolab-%{version} libkolab-%{version}-python3
 %endif
@@ -295,13 +307,35 @@
 %endif
     -DPHP_BINDINGS=ON \
     -DPHP_INSTALL_DIR=%{php_extdir} \
-    -DPYTHON_BINDINGS=ON \
-    -DPYTHON_INSTALL_DIR=%{python2_sitearch} \
     ..
 make
 popd
 popd
 
+%if 0%{with_python}
+    pushd %{name}-%{version}-python
+    rm -rf build
+    mkdir -p build
+    pushd build
+    %cmake \
+        -DCMAKE_C_FLAGS:STRING="-DNDEBUG -DQT_NO_DEBUG" \
+        -DBoost_NO_BOOST_CMAKE=TRUE \
+        -Wno-fatal-errors -Wno-errors \
+        -DINCLUDE_INSTALL_DIR=%{_includedir} \
+%if 0%{?rhel} >= 8 || 0%{?fedora}
+        -DQT5_BUILD=ON \
+%endif
+        -DINCLUDE_INSTALL_DIR=%{_includedir} \
+%if 0%{?rhel} < 8 && 0%{?fedora} < 20
+        -DUSE_LIBCALENDARING=ON \
+%endif
+        -DPYTHON_BINDINGS=ON \
+        -DPYTHON_INSTALL_DIR=%{python2_sitearch} \
+        ..
+    make
+    popd
+    popd
+%endif
 
 %if 0%{with_python3}
     pushd %{name}-%{version}-python3
@@ -421,13 +455,23 @@
 done
 %endif
 
+%if 0%{?with_python}
+pushd %{name}-%{version}-python
+pushd build
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+popd
 touch %{buildroot}/%{python2_sitearch}/kolab/__init__.py
+popd
+%endif
+
+
 %if 0%{?with_python3}
 pushd %{name}-%{version}-python3
 pushd build
 make install DESTDIR=%{buildroot} INSTALL='install -p'
 popd
 touch %{buildroot}/%{python3_sitearch}/kolab/__init__.py
+popd
 %endif
 
 %check
@@ -519,6 +563,7 @@
 /opt/plesk/php/7.4/etc/php-fpm.d/*.ini
 %endif
 
+%if 0%{?with_python} > 0
 %files -n python-kolab
 %dir %{python2_sitearch}/kolab/
 %{python2_sitearch}/kolab/__init__.py*
@@ -528,6 +573,7 @@
 %{python2_sitearch}/kolab/kolabobject.py*
 %{python2_sitearch}/kolab/_shared.so*
 %{python2_sitearch}/kolab/shared.py*
+%endif
 
 %if 0%{?with_python3}
 %files -n python3-kolab

debian.control Changed

Build Results
RPM Lint

Refresh

Comments for request 3071 0

Request History

mollekopf created request over 1 year ago

Build on centos 9 stream

mollekopf accepted request over 1 year ago