| |
@@ -1,7 +1,7 @@
|
| |
Name: qhexedit2
|
| |
# Remember to also update version in qhexedit2_build.patch in the setup.py hunk
|
| |
Version: 0.8.9
|
| |
- Release: 4%{?dist}
|
| |
+ Release: 5%{?dist}
|
| |
Summary: Binary Editor for Qt
|
| |
|
| |
License: LGPLv2
|
| |
@@ -11,6 +11,7 @@
|
| |
|
| |
# Fix build issues
|
| |
Patch0: qhexedit2_build.patch
|
| |
+ Patch1: sip5.patch
|
| |
|
| |
BuildRequires: desktop-file-utils
|
| |
BuildRequires: gcc-c++
|
| |
@@ -21,6 +22,8 @@
|
| |
BuildRequires: python3-pyqt5-sip
|
| |
BuildRequires: python3-PyQt4-devel
|
| |
BuildRequires: python3-qt5-devel
|
| |
+ BuildRequires: %{py3_dist PyQt-builder}
|
| |
+ BuildRequires: %{py3_dist sip} >= 5
|
| |
|
| |
Requires: %{name}-qt5-libs%{?_isa} = %{version}-%{release}
|
| |
|
| |
@@ -74,26 +77,6 @@
|
| |
|
| |
###############################################################################
|
| |
|
| |
- %package -n python3-%{name}
|
| |
- Summary: %{name} Qt4 Python3 bindings
|
| |
- Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
| |
- %{?python_provide:%python_provide python3-%{name}}
|
| |
-
|
| |
- %description -n python3-%{name}
|
| |
- %{name} Qt4 Python3 bindings.
|
| |
-
|
| |
-
|
| |
- %package -n python3-%{name}-devel
|
| |
- Summary: Development files for the %{name} Qt4 Python3 bindings
|
| |
- Requires: python3-%{name}%{?_isa} = %{version}-%{release}
|
| |
- Requires: python3-sip-devel
|
| |
- %{?python_provide:%python_provide python3-%{name}-devel}
|
| |
-
|
| |
- %description -n python3-%{name}-devel
|
| |
- Development files for the %{name} Qt4 Python3 bindings
|
| |
-
|
| |
- ###############################################################################
|
| |
-
|
| |
%package -n python3-%{name}-qt5
|
| |
Summary: %{name} Qt5 Python3 bindings
|
| |
Requires: %{name}-qt5-libs%{?_isa} = %{version}-%{release}
|
| |
@@ -106,7 +89,7 @@
|
| |
%package -n python3-%{name}-qt5-devel
|
| |
Summary: Development files for the %{name} Qt5 Python3 bindings
|
| |
Requires: python3-%{name}-qt5%{?_isa} = %{version}-%{release}
|
| |
- Requires: python3-sip-devel
|
| |
+ Requires: %{py3_dist sip} >= 5
|
| |
%{?python_provide:%python_provide python3-%{srcname}-qt5-devel}
|
| |
|
| |
%description -n python3-%{name}-qt5-devel
|
| |
@@ -130,9 +113,6 @@
|
| |
%make_build
|
| |
popd
|
| |
|
| |
- # Build sip bindings, qt4, python3
|
| |
- %{__python3} setup.py build --build-base=build-python3-qt4
|
| |
-
|
| |
# Build library, qt5
|
| |
mkdir build-lib-qt5
|
| |
pushd build-lib-qt5
|
| |
@@ -141,7 +121,8 @@
|
| |
popd
|
| |
|
| |
# Build sip bindings, qt5, python3
|
| |
- USE_QT5=1 %{__python3} setup.py build --build-base=build-python3-qt5
|
| |
+ sip-build --qmake=%{_qt5_qmake} --verbose --build-dir=build-python3-qt5 --no-make
|
| |
+ %make_build -C build-python3-qt5
|
| |
|
| |
# Build application
|
| |
mkdir build-example
|
| |
@@ -189,9 +170,7 @@
|
| |
|
| |
# Python bindings
|
| |
# Distutils does not support --build-base with install, you need to build also...
|
| |
- CFLAGS="%{optflags}" %{__python3} setup.py build --build-base=build-python3-qt4 install --skip-build --root %{buildroot}
|
| |
- USE_QT5=1 CFLAGS="%{optflags}" %{__python3} setup.py build --build-base=build-python3-qt5 install --skip-build --root %{buildroot}
|
| |
- install -Dpm 0644 src/qhexedit.sip %{buildroot}%{_datadir}/python3-sip/qhexedit/qhexedit.sip
|
| |
+ %make_install INSTALL_ROOT=%{buildroot} -C build-python3-qt5
|
| |
|
| |
# Application
|
| |
install -Dpm 0755 build-example/qhexedit %{buildroot}%{_bindir}/qhexedit
|
| |
@@ -226,21 +205,17 @@
|
| |
%license src/license.txt
|
| |
%doc doc/html
|
| |
|
| |
- %files -n python3-%{name}
|
| |
- %{python3_sitearch}/qhexedit.*.so
|
| |
- %{python3_sitearch}/QHexEdit-%{version}-*.egg-info
|
| |
-
|
| |
- %files -n python3-%{name}-devel
|
| |
- %{_datadir}/python3-sip/qhexedit/
|
| |
-
|
| |
%files -n python3-%{name}-qt5
|
| |
- %{python3_sitearch}/qhexedit-qt5.*.so
|
| |
- %{python3_sitearch}/QHexEdit_qt5-%{version}-*.egg-info
|
| |
+ %{python3_sitearch}/qhexedit.*.so
|
| |
+ %{python3_sitearch}/QHexEdit-%{version}*info
|
| |
|
| |
%files -n python3-%{name}-qt5-devel
|
| |
- %{_datadir}/python3-sip/qhexedit/
|
| |
+ %{python3_sitearch}/PyQt5/bindings/qhexedit/
|
| |
|
| |
%changelog
|
| |
+ * Wed Jun 16 2021 Scott Talbert <swt@techie.net> - 0.8.9-5
|
| |
+ - Update to build with sip 5
|
| |
+
|
| |
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.8.9-4
|
| |
- Rebuilt for Python 3.10
|
| |
|
| |
Please DON'T MERGE but do provide comments/approval. This is part of a coordinated move to sip5 in F35+.