summaryrefslogtreecommitdiffstats
path: root/redhat/applications/koffice
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2019-11-03 11:03:22 +0100
committerFrançois Andriot <[email protected]>2019-11-03 11:16:56 +0100
commitcd8eb9fd74fafb2435bc1f878cbb2bc91f52d859 (patch)
tree51c7e8b06b5c920736585ff8dbead62834875859 /redhat/applications/koffice
parent411aad4790a5b19fe3f927c4dffd18116fe4db16 (diff)
downloadtde-packaging-cd8eb9fd74fafb2435bc1f878cbb2bc91f52d859.tar.gz
tde-packaging-cd8eb9fd74fafb2435bc1f878cbb2bc91f52d859.zip
RPM: update spec files for TDE 14.0.7
Diffstat (limited to 'redhat/applications/koffice')
-rw-r--r--redhat/applications/koffice/koffice.spec (renamed from redhat/applications/koffice/koffice-14.0.0.spec)16
1 files changed, 14 insertions, 2 deletions
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice.spec
index ce0cec112..49024b66a 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -18,7 +18,7 @@
# TDE variables
%define tde_epoch 2
%if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.0.7
%endif
%define tde_pkg koffice
%define tde_prefix /opt/trinity
@@ -101,7 +101,6 @@ BuildRequires: libjpeg-devel
BuildRequires: ImageMagick-devel
BuildRequires: zlib-devel
BuildRequires: openssl-devel
-BuildRequires: python-devel
BuildRequires: pcre-devel
BuildRequires: gettext-devel
BuildRequires: mysql-devel
@@ -113,6 +112,17 @@ BuildRequires: OpenEXR-devel
BuildRequires: libexif-devel
BuildRequires: readline-devel
+# PYTHON support
+%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31
+%define python python2
+%define __python %__python2
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%else
+%define python python
+%endif
+BuildRequires: %{python}
+BuildRequires: %{python}-devel
+
# LCMS support
%if 0%{?suse_version} || 0%{?rhel} >= 7
BuildRequires: liblcms-devel
@@ -712,6 +722,8 @@ Requires: fonts-ttf-dejavu
%else
%if 0%{?fedora} >= 11 || 0%{?rhel} >= 6
Requires: dejavu-lgc-sans-fonts
+%endif
+%if 0%{?fedora} >= 11 || 0%{?rhel} == 6 || 0%{?rhel} == 7
Requires: lyx-cmex10-fonts
%endif
%if 0%{?rhel} == 5