From a8e7074c16a34fbb6112225ba531c3875801d2c3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 16 Feb 2017 09:26:31 -0600 Subject: [PATCH] move -devel binaries to main pkg(s) (#1422613) --- python-qt5.spec | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/python-qt5.spec b/python-qt5.spec index 60606ff..367bcf1 100644 --- a/python-qt5.spec +++ b/python-qt5.spec @@ -20,7 +20,7 @@ Summary: PyQt5 is Python bindings for Qt5 Name: python-qt5 Version: 5.7.1 -Release: 4%{?dist} +Release: 5%{?dist} # all BSD, except for GPLv2+ dbus bindings and examples License: BSD and GPLv2+ @@ -319,6 +319,14 @@ sed -i \ %{python2_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.so %{python2_sitearch}/PyQt5/uic/ %{_qt5_plugindir}/designer/libpyqt5.so +# *was* in -devel +%{_bindir}/pylupdate5 +%{_bindir}/pyrcc5 +%{_bindir}/pyuic5 +%{python2_sitearch}/PyQt5/pylupdate.so +%{python2_sitearch}/PyQt5/pylupdate_main.py* +%{python2_sitearch}/PyQt5/pyrcc.so +%{python2_sitearch}/PyQt5/pyrcc_main.py* %if 0%{?webengine} %files webengine @@ -337,14 +345,7 @@ sed -i \ %{rpm_macros_dir}/macros.pyqt5 %files devel -%{_bindir}/pylupdate5 -%{_bindir}/pyrcc5 -%{_bindir}/pyuic5 %{_datadir}/sip/PyQt5/ -%{python2_sitearch}/PyQt5/pylupdate.so -%{python2_sitearch}/PyQt5/pylupdate_main.py* -%{python2_sitearch}/PyQt5/pyrcc.so -%{python2_sitearch}/PyQt5/pyrcc_main.py* %endif %if 0%{?with_python3} @@ -389,6 +390,15 @@ sed -i \ %{python3_sitearch}/PyQt5/_QOpenGLFunctions_2_1.* %{python3_sitearch}/PyQt5/_QOpenGLFunctions_4_1_Core.* %{python3_sitearch}/PyQt5/uic/ +# *was* in python3-qt5-devel +%{_bindir}/pylupdate5 +%{_bindir}/pyrcc5 +%{_bindir}/pyuic5 +%{_datadir}/python3-sip/PyQt5/ +%{python3_sitearch}/PyQt5/pylupdate.so +%{python3_sitearch}/PyQt5/pylupdate_main.py* +%{python3_sitearch}/PyQt5/pyrcc.so +%{python3_sitearch}/PyQt5/pyrcc_main.py* %if 0%{?webengine} %files -n python3-qt5-webengine @@ -404,14 +414,7 @@ sed -i \ %endif %files -n python3-qt5-devel -%{_bindir}/pylupdate5 -%{_bindir}/pyrcc5 -%{_bindir}/pyuic5 %{_datadir}/python3-sip/PyQt5/ -%{python3_sitearch}/PyQt5/pylupdate.so -%{python3_sitearch}/PyQt5/pylupdate_main.py* -%{python3_sitearch}/PyQt5/pyrcc.so -%{python3_sitearch}/PyQt5/pyrcc_main.py* %endif # with_python3 %files doc @@ -425,6 +428,9 @@ sed -i \ %changelog +* Thu Feb 16 2017 Rex Dieter - 5.7.1-5 +- move -devel binaries to main pkg(s) (#1422613) + * Sat Feb 11 2017 Fedora Release Engineering - 5.7.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild