| |
@@ -15,7 +15,7 @@
|
| |
Summary: A Scintilla port to Qt
|
| |
Name: qscintilla
|
| |
Version: 2.10.3
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
|
| |
License: GPLv3
|
| |
Url: http://www.riverbankcomputing.com/software/qscintilla/
|
| |
@@ -52,12 +52,12 @@
|
| |
%package -n python2-qscintilla
|
| |
Summary: QScintilla python2 bindings
|
| |
BuildRequires: PyQt4-devel
|
| |
- BuildRequires: sip-devel >= %{sip_ver}
|
| |
+ BuildRequires: python2-sip-devel >= %{sip_ver}
|
| |
Obsoletes: qscintilla-python < 2.9.2-2
|
| |
Provides: qscintilla-python = %{version}-%{release}
|
| |
Provides: python2-PyQt4-Qsci = %{version}-%{release}
|
| |
Requires: %{name}%{?_isa} = %{version}-%{release}
|
| |
- Requires: PyQt4
|
| |
+ Requires: python2-qt4
|
| |
%{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
|
| |
%description -n python2-qscintilla
|
| |
%{summary}.
|
| |
@@ -74,9 +74,9 @@
|
| |
%if 0%{?qt5}
|
| |
%package -n python2-qscintilla-qt5
|
| |
Summary: QScintilla-qt5 python2 bindings
|
| |
- BuildRequires: python-qt5
|
| |
- BuildRequires: python-qt5-devel
|
| |
- BuildRequires: sip-devel >= %{sip_ver}
|
| |
+ BuildRequires: python2-qt5
|
| |
+ BuildRequires: python2-qt5-devel
|
| |
+ BuildRequires: python2-sip-devel >= %{sip_ver}
|
| |
Provides: %{name}-qt5-python2 = %{version}-%{release}
|
| |
Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
|
| |
Requires: python2-qt5%{?pyqt5_version: >= %{pyqt5_version}}
|
| |
@@ -87,7 +87,7 @@
|
| |
%package -n python2-qscintilla-qt5-devel
|
| |
Summary: Development files for QScintilla-qt5 python2 bindings
|
| |
Provides: %{name}-qt5-python2-devel = %{version}-%{release}
|
| |
- Requires: python-qt5-devel
|
| |
+ Requires: python2-qt5-devel
|
| |
BuildArch: noarch
|
| |
%description -n python2-qscintilla-qt5-devel
|
| |
%{summary}.
|
| |
@@ -98,7 +98,7 @@
|
| |
%package -n python3-qscintilla
|
| |
Summary: QScintilla python3 bindings
|
| |
BuildRequires: python3-PyQt4-devel
|
| |
- BuildRequires: sip-devel >= %{sip_ver}
|
| |
+ BuildRequires: python2-sip-devel >= %{sip_ver}
|
| |
Provides: %{name}-python3 = %{version}-%{release}
|
| |
Provides: python3-PyQt5-Qsci = %{version}-%{release}
|
| |
Requires: %{name}%{?_isa} = %{version}-%{release}
|
| |
@@ -135,7 +135,7 @@
|
| |
Summary: QScintilla-qt5 python3 bindings
|
| |
BuildRequires: python3-qt5
|
| |
BuildRequires: python3-qt5-devel
|
| |
- BuildRequires: sip-devel >= %{sip_ver}
|
| |
+ BuildRequires: python2-sip-devel >= %{sip_ver}
|
| |
Provides: %{name}-qt5-python3 = %{version}-%{release}
|
| |
Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
|
| |
Requires: python3-qt5%{?pyqt5_version: >= %{pyqt5_version}}
|
| |
@@ -389,6 +389,10 @@
|
| |
|
| |
|
| |
%changelog
|
| |
+ * Fri Mar 23 2018 Iryna Shcherbina <ishcherb@redhat.com> - 2.10.3-2
|
| |
+ - Update Python 2 dependency declarations to new packaging standards
|
| |
+ (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
| |
+
|
| |
* Wed Mar 07 2018 Rex Dieter <rdieter@fedoraproject.org> - 2.10.3-1
|
| |
- qscintilla-2.10.3
|
| |
- BR: gcc-c++, use %%make_build
|
| |
ishcherb
commented 6 years ago
This package uses names with ambiguous
python-prefix in requirements.According to Fedora Packaging guidelines for Python, packages must use names with either
python2-orpython3-prefix in requirements where available.We are aiming to rename
python-*dependencies topython2-*, so we can later switch thepython-*namespace to Python 3.This PR is part of Fedora's Switch to Python 3 effort.
Note that, although this PR was created automatically, we will respond to any comments or issues which you might find with it. We will keep the PR open for review for a week, and if there's no feedback we'll merge it. There is no need to build the package right after merge, this change can wait for the next package rebuild.
The local mock build passed, for Koji scratch build please see simple-koji-ci result.
Note: please do not backport this to f26, f27 branches, as some of the modified requirements are not available there
This PR was opened automatically, for source code see here