[packages/python-PyQt5] - moved pyuic5 name to python3, release 3

[qboosh]

commit 3b9125f78871a2d8c6aa0e8199ed99fd48f774b8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Mon May 20 19:58:37 2024 +0200

    - moved pyuic5 name to python3, release 3

 python-PyQt5.spec | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)
---
diff --git a/python-PyQt5.spec b/python-PyQt5.spec
index b4117b6..5e26c3b 100644
--- a/python-PyQt5.spec
+++ b/python-PyQt5.spec
@@ -17,7 +17,7 @@ Summary(pl.UTF-8):	Wiązania Pythona 2 do toolkitu Qt5
 Name:		python-%{module}
 # 5.15.5 seems to be the last python2-compatible version
 Version:	5.15.5
-Release:	2
+Release:	3
 License:	GPL v3
 Group:		Libraries/Python
 #Source0Download: https://pypi.org/simple/PyQt5/
@@ -156,6 +156,7 @@ Summary:	pyuic5 development tool for Python 3
 Summary(pl.UTF-8):	Narzędzie programistyczne pyuic5 dla Pythona 3
 Group:		Development/Tools
 Requires:	python3-PyQt5 = %{version}-%{release}
+Conflicts:	python-PyQt5-uic < 5.15.5-3
 
 %description -n python3-PyQt5-uic
 pyuic5 development tool for Python 3.
@@ -304,17 +305,6 @@ cd ..
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
-%if %{with python3}
-%{__make} -C build-py3 install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
-
-%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
-%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
-
-%{__mv} $RPM_BUILD_ROOT%{_bindir}/pyuic5{,-3}
-%endif
-
 %if %{with python2}
 %{__make} -C build-py2 install \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -323,6 +313,8 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %py_comp $RPM_BUILD_ROOT%{py_sitedir}
 %py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
 
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/pyuic5{,-2}
+
 # don't use py_postclean, leave *.py in %{py_sitedir}/PyQt4/uic/widget-plugins
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt5/*.py
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt5/uic/*.py
@@ -332,6 +324,18 @@ install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 %{__rm} $RPM_BUILD_ROOT%{py_sitedir}/PyQt5/uic/port_v3/*.py
 %endif
 
+%if %{with python3}
+%{__make} -C build-py3 install \
+	DESTDIR=$RPM_BUILD_ROOT \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
+%py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
+%py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
+
+%{__mv} $RPM_BUILD_ROOT%{_bindir}/pyuic5{,-3}
+ln -sf pyuic5-3 $RPM_BUILD_ROOT%{_bindir}/pyuic5
+%endif
+
 cp -R examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 %clean
@@ -393,7 +397,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files uic
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/pyuic5
+%attr(755,root,root) %{_bindir}/pyuic5-2
 %{py_sitedir}/PyQt5/uic
 %endif
 
@@ -494,6 +498,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n python3-PyQt5-uic
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/pyuic5
 %attr(755,root,root) %{_bindir}/pyuic5-3
 %{py3_sitedir}/PyQt5/uic
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-PyQt5.git/commitdiff/3b9125f78871a2d8c6aa0e8199ed99fd48f774b8