Request 2834 (accepted)

This request supersedes: request 2828 (Show diff)

Overview

Request 2834 (accepted)

Build on centos8

Created by mollekopf over 3 years ago
In state accepted
Supersedes 2828
Open review for Admin
Open review for vanmeeuwen

Submit libkolab

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

libkolab.spec Changed

@@ -20,7 +20,7 @@
 # Filter out private python and php libs. Does not work on EPEL5,
 # therefor we use it conditionally
 %{?filter_setup:
-%filter_provides_in %{python_sitearch}/.*\.so$
+%filter_provides_in %{python3_sitearch}/.*\.so$
 %filter_provides_in %{php_extdir}/.*\.so$
 %filter_setup
 }
@@ -45,8 +45,10 @@
 Patch2:         0002-Fixed-memory-leaks-in-tests.patch
 
 BuildRequires:  cmake
-%if 0%{?rhel} > 7 || 0%{?fedora} >= 20
-BuildRequires:  kdepimlibs-devel >= 4.11
+%if 0%{?rhel} > 7 || 0%{?fedora}
+BuildRequires:  kf5-kcoreaddons-devel
+BuildRequires:  kf5-kcalendarcore-devel
+BuildRequires:  kf5-kmime-devel
 %else
 # Note: available within kolabsys.com infrastructure only, as being (essentially) a
 # fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6.
@@ -67,11 +69,11 @@
 BuildRequires:  plesk-php74-devel
 %endif
 
-BuildRequires:  python-devel
+BuildRequires:  python3-devel
 %if 0%{?suse_version}
 BuildRequires:  qt-devel
 %else
-BuildRequires:  qt4-devel
+BuildRequires:  qt5-qtbase-devel
 %endif
 Provides:       libkolab%{?_isa} = %{version}
 
@@ -85,8 +87,10 @@
 %endif
 Summary:        Kolab library development headers
 Requires:       libkolab%{?_isa} = %{version}
-%if 0%{?rhel} > 7 || 0%{?fedora} >= 20
-BuildRequires:  kdepimlibs-devel >= 4.11
+%if 0%{?rhel} > 7 || 0%{?fedora}
+BuildRequires:  kf5-kcoreaddons-devel
+BuildRequires:  kf5-kcalendarcore-devel
+BuildRequires:  kf5-kmime-devel
 %if 0%{?fedora} >= 21
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca
 BuildRequires: qca
@@ -99,7 +103,7 @@
 Requires:       libkolabxml-devel >= 1.0
 Requires:       php-devel
 Requires:       pkgconfig
-Requires:       python-devel
+Requires:       python36-devel
 
 %if 0%{?suse_version}
 %description -n libkolab-devel
@@ -276,7 +280,7 @@
     -DPHP_BINDINGS=ON \
     -DPHP_INSTALL_DIR=%{php_extdir} \
     -DPYTHON_BINDINGS=ON \
-    -DPYTHON_INSTALL_DIR=%{python_sitearch} \
+    -DPYTHON_INSTALL_DIR=%{python3_sitearch} \
     ..
 make
 popd
@@ -330,7 +334,6 @@
 extension=kolabobject.so
 extension=kolabshared.so
 extension=kolabcalendaring.so
-extension=kolabicalendar.so
 EOF
 
 # Workaround for #2050
@@ -358,7 +361,6 @@
     echo "extension=kolabobject.so" > %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=kolabshared.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=kolabcalendaring.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
-    echo "extension=kolabicalendar.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini
     echo "extension=dummy.so" >> %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolabdummy.ini
 
     cp %{buildroot}/opt/plesk/php/${version}/etc/php.d/kolab.ini \
@@ -371,7 +373,7 @@
 done
 %endif
 
-touch %{buildroot}/%{python_sitearch}/kolab/__init__.py
+touch %{buildroot}/%{python3_sitearch}/kolab/__init__.py
 
 %check
 pushd %{name}-%{version}/build/tests
@@ -409,8 +411,6 @@
 %config(noreplace) %{php_inidir}/kolabdummy.ini
 %{_datadir}/%{php}/kolabcalendaring.php
 %{php_extdir}/kolabcalendaring.so
-%{_datadir}/%{php}/kolabicalendar.php
-%{php_extdir}/kolabicalendar.so
 %{_datadir}/%{php}/kolabobject.php
 %{php_extdir}/kolabobject.so
 %{_datadir}/%{php}/kolabshared.php
@@ -463,16 +463,14 @@
 %endif
 
 %files -n python-kolab
-%dir %{python_sitearch}/kolab/
-%{python_sitearch}/kolab/__init__.py*
-%{python_sitearch}/kolab/_calendaring.so
-%{python_sitearch}/kolab/calendaring.py*
-%{python_sitearch}/kolab/_icalendar.so
-%{python_sitearch}/kolab/icalendar.py*
-%{python_sitearch}/kolab/_kolabobject.so*
-%{python_sitearch}/kolab/kolabobject.py*
-%{python_sitearch}/kolab/_shared.so*
-%{python_sitearch}/kolab/shared.py*
+%dir %{python3_sitearch}/kolab/
+%{python3_sitearch}/kolab/__init__.py*
+%{python3_sitearch}/kolab/_calendaring.so
+%{python3_sitearch}/kolab/calendaring.py*
+%{python3_sitearch}/kolab/_kolabobject.so*
+%{python3_sitearch}/kolab/kolabobject.py*
+%{python3_sitearch}/kolab/_shared.so*
+%{python3_sitearch}/kolab/shared.py*
 
 %changelog
 * Mon Feb 09 2015 Timotheus Pokorra <tp@tbits.net>

debian.changelog Changed

debian.tar.gz/kolab.ini Changed

libkolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2834 0

Request History

mollekopf created request over 3 years ago

Build on centos8

mollekopf accepted request over 3 years ago