summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2023-04-09 19:18:23 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2023-04-09 19:24:19 +0200
commit27a2131e8b70c78219fd248db2f35d2a7d12be1e (patch)
treecf942d668609a882c17dcdfa474aee1c464f12b9
parenta4ba311486b1c106b77f4288e3a53d59ebd9b58e (diff)
downloadtde-packaging-27a2131e.tar.gz
tde-packaging-27a2131e.zip
RPM: update tdebindings
Signed-off-by: François Andriot <albator78@libertysurf.fr>
-rw-r--r--redhat/core/tdebindings/tdebindings.spec19
1 files changed, 5 insertions, 14 deletions
diff --git a/redhat/core/tdebindings/tdebindings.spec b/redhat/core/tdebindings/tdebindings.spec
index 3a827ab6d..34a6c8212 100644
--- a/redhat/core/tdebindings/tdebindings.spec
+++ b/redhat/core/tdebindings/tdebindings.spec
@@ -169,22 +169,12 @@ BuildRequires: Mesa-libGLU-devel
%endif
# PYTHON support
-%if 0%{?sle_version} >= 150400 || 0%{?rhel} >= 9
-%define with_python 0
-%global __python %__python3
-%else
%define with_python 1
-%if 0%{?rhel} >= 7 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 0%{?mgaversion} >= 7
-%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 python3
+%global python_sitearch %{python3_sitearch}
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
-%endif
## ruby
BuildRequires: ruby-devel >= 1.8
@@ -696,6 +686,7 @@ This package is part of the official TDE bindings module.
%{python_sitearch}/pcop.la
%{python_sitearch}/pcop.so
%{python_sitearch}/pydcop.py*
+%{python_sitearch}/__pycache__/*.pyc
%endif
@@ -1160,7 +1151,7 @@ EXTRA_INCLUDES="/usr/include/ruby-%{rb_ver}:/usr/include/ruby-%{rb_ver}/%{_targe
--enable-rpath \
--disable-gcc-hidden-visibility \
\
- --with-extra-includes=%{_includedir}/tqscintilla:${EXTRA_INCLUDES} \
+ --with-extra-includes=%{_includedir}/tqt:${EXTRA_INCLUDES} \
--with-extra-libs=%{tde_libdir} \
%if 0%{with_python}
--with-pythondir=%{_usr} \