summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2023-04-09 19:18:09 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2023-04-09 19:24:19 +0200
commit09e63fe074675fa2dd9a4fb939177a675bd58994 (patch)
tree423a1aebeed6378bc47c3878ba21a3aa5b253ec6 /redhat
parentc0dd088bafa68ea6f6a0e00d805a499a3779218a (diff)
downloadtde-packaging-09e63fe074675fa2dd9a4fb939177a675bd58994.tar.gz
tde-packaging-09e63fe074675fa2dd9a4fb939177a675bd58994.zip
RPM: update pytqt
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat')
-rw-r--r--redhat/dependencies/pytqt/pytqt.spec50
1 files changed, 19 insertions, 31 deletions
diff --git a/redhat/dependencies/pytqt/pytqt.spec b/redhat/dependencies/pytqt/pytqt.spec
index ccf826308..a36560eab 100644
--- a/redhat/dependencies/pytqt/pytqt.spec
+++ b/redhat/dependencies/pytqt/pytqt.spec
@@ -73,19 +73,9 @@ BuildRequires: libtqscintilla-devel >= %{?epoch:%{epoch}:}1.7.1
BuildRequires: gcc-c++
# PYTHON support
-%if 0%{?sle_version} >= 150400
%define python python3
%define __python %__python3
-%else
-%if 0%{?rhel} >= 8 || 0%{?fedora} >= 31 || 0%{?suse_version} >= 1550 || 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)")}
-%endif
+%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
BuildRequires: %{python}
BuildRequires: %{python}-devel
@@ -148,15 +138,15 @@ same way in both languages (with syntax differences, of course)
%files -n pytqt
%defattr(-,root,root,-)
%doc NEWS README
-%dir %{python_sitearch}/python_tqt
-%{python_sitearch}/python_tqt/__init__.py*
-%{python_sitearch}/python_tqt/qt.so
-%{python_sitearch}/python_tqt/qtcanvas.so
-%{python_sitearch}/python_tqt/qtnetwork.so
-%{python_sitearch}/python_tqt/qtsql.so
-%{python_sitearch}/python_tqt/qttable.so
-%{python_sitearch}/python_tqt/qtui.so
-%{python_sitearch}/python_tqt/qtxml.so
+%dir %{python_sitearch}/PyTQt
+%{python_sitearch}/PyTQt/__init__.py*
+%{python_sitearch}/PyTQt/tqt.so
+%{python_sitearch}/PyTQt/tqtcanvas.so
+%{python_sitearch}/PyTQt/tqtnetwork.so
+%{python_sitearch}/PyTQt/tqtsql.so
+%{python_sitearch}/PyTQt/tqttable.so
+%{python_sitearch}/PyTQt/tqtui.so
+%{python_sitearch}/PyTQt/tqtxml.so
##########
@@ -174,7 +164,7 @@ portable graphics-capable scripts.
%files -n pytqt-gl
%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/qtgl.so
+%{python_sitearch}/PyTQt/tqtgl.so
##########
@@ -193,7 +183,7 @@ pytqt Extensions. Contains:
%files -n pytqt-tqtext
%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/qtext.so
+%{python_sitearch}/PyTQt/tqtext.so
##########
@@ -211,8 +201,9 @@ Linguist translation files from Python code.
%files -n trinity-pytqt-tools
%defattr(-,root,root,-)
-%{tde_bindir}/pylupdate
-%{tde_bindir}/pyuic
+%{tde_bindir}/pytqlupdate
+%{tde_bindir}/pytquic
+%{python_sitearch}/PyTQt/__pycache__/
##########
@@ -232,7 +223,7 @@ packages based on them, like PyTDE.
%files -n pytqt-devel
%defattr(-,root,root,-)
-%{python_sitearch}/python_tqt/pyqtconfig.py*
+%{python_sitearch}/PyTQt/pytqtconfig.py*
%dir %{_datadir}/sip
%{_datadir}/sip/tqt/
@@ -255,16 +246,13 @@ export PATH="%{tde_bindir}:${PATH}"
mkdir build
cd build
-# WTF ? CentOS 6 !
-cp -rf ../pyuic3 ../pylupdate3
-
echo yes | %__python ../configure.py \
- -c -n %{_includedir}/tqscintilla \
+ -c -n %{_includedir}/tqt3 \
-g %{_includedir}/tqt3 \
-q %{_datadir}/tqt3 \
-y tqt-mt \
-o %{_libdir} -u -j 10 \
- -d %{python_sitearch}/python_tqt \
+ -d %{python_sitearch}/PyTQt \
-v %{_datadir}/sip/tqt \
-b %{tde_bindir} \
-w \
@@ -282,7 +270,7 @@ echo yes | %__python ../configure.py \
%clean
-%__rm -rf %{?buildroot}%{python_sitearch}/python_tqt/__init__.py
+%__rm -rf %{?buildroot}%{python_sitearch}/PyTQt/__init__.py
%changelog