summaryrefslogtreecommitdiffstats
path: root/redhat/applications/office
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2023-04-09 19:16:26 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2023-04-09 19:24:18 +0200
commit61c44c4a5cd743fefb0c781c1e1e7981cb8a07e6 (patch)
treea07962bafabd04afdf3fe30b6213b8ae1a46a24b /redhat/applications/office
parentfd9a8063b89f551063ab697d951a635539de65ed (diff)
downloadtde-packaging-61c44c4a5cd743fefb0c781c1e1e7981cb8a07e6.tar.gz
tde-packaging-61c44c4a5cd743fefb0c781c1e1e7981cb8a07e6.zip
RPM: update koffice
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/applications/office')
-rw-r--r--redhat/applications/office/koffice/koffice.spec25
1 files changed, 8 insertions, 17 deletions
diff --git a/redhat/applications/office/koffice/koffice.spec b/redhat/applications/office/koffice/koffice.spec
index 42851dd74..c351a1633 100644
--- a/redhat/applications/office/koffice/koffice.spec
+++ b/redhat/applications/office/koffice/koffice.spec
@@ -113,19 +113,15 @@ BuildRequires: libexif-devel
BuildRequires: readline-devel
# PYTHON support
-%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
+# lib/kross/configure.in.in :
+# WARNING: Building Kross python plugin is now prohibited at all times,
+# because it is not compatible with Python >= 3.
%define with_python 0
+%global python python3
%global __python %__python3
-%else
-%define with_python 1
-%if 0%{?rhel} == 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1500 || 0%{?mgaversion} >= 8
-%global python python2
-%global __python %__python2
-%global python_sitearch %{python2_sitearch}
-%else
-%global python python
-%endif
-%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%if 0%{?with_python}
BuildRequires: %{python}
BuildRequires: %{python}-devel
%endif
@@ -249,7 +245,7 @@ BuildRequires: wv2-devel
# MESA support
%if 0%{?mgaversion} || 0%{?mdkversion}
-BuildRequires: %{_lib}mesagl1-devel
+BuildRequires: %{_lib}mesagl-devel
BuildRequires: %{_lib}mesaglu1-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
@@ -261,11 +257,6 @@ BuildRequires: Mesa-libGL-devel
BuildRequires: Mesa-libGLU-devel
%endif
-# OPENJPEG
-%if 0%{?mgaversion} || 0%{?mdkversion}
-#BuildRequires: %{_lib}openjpeg-devel
-%endif
-
# LIBXI support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xi-devel