From 8b5b7131e59474d1a4e06a9959b3a4408beace90 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Apr 18 2016 15:46:19 +0000
Subject: 2.9.2-2


- support bootstapping
- rename qscintilla-python => python2-qscintilla
- Provides: python(2|3)-PyQt(4|5)-Qsci

---

diff --git a/qscintilla.spec b/qscintilla.spec
index b8bdae0..9854333 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -2,15 +2,18 @@
 %global scintilla_ver 3.5.4
 
 # bootstrapping -python
-# undef python macros if you'd like to build qscintilla sans -python subpkg (which requires PyQt4)
+#global bootstrap 1
+
+%if ! 0%{?bootstrap}
 %global python2 1
 %global python3 1
+%endif
 %global qt5 1
 
 Summary: A Scintilla port to Qt
 Name:    qscintilla
 Version: 2.9.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPLv3
 Url:     http://www.riverbankcomputing.com/software/qscintilla/
@@ -44,23 +47,26 @@ Requires: qt4-devel
 %{summary}.
 
 %if 0%{?python2}
-%package python
-Summary:  QScintilla python bindings
+%package -n python2-qscintilla
+Summary:  QScintilla python2 bindings
 BuildRequires: PyQt4-devel
 BuildRequires: sip-devel >= 3.16
-Provides: python2-qscintilla = %{version}-%{release}
+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
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
-%description python
+%description -n python2-qscintilla
 %{summary}.
 
-%package python-devel
-Summary:  Development files for QScintilla python bindings
-Provides: python2-qscintilla-devel = %{version}-%{release}
+%package -n python2-qscintilla-devel
+Summary:  Development files for QScintilla python2 bindings
+Obsoletes: qscintilla-python-devel < 2.9.2-2
+Provides:  qscintilla-python-devel = %{version}-%{release}
 Requires: PyQt4-devel
 BuildArch: noarch
-%description python-devel
+%description -n python2-qscintilla-devel
 %{summary}.
 %endif
 
@@ -70,6 +76,7 @@ Summary:  QScintilla python3 bindings
 BuildRequires: python3-PyQt4-devel
 BuildRequires: sip-devel >= 3.16
 Provides: %{name}-python3 = %{version}-%{release}
+Provides: python3-PyQt5-Qsci = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: python3-PyQt4
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
@@ -277,11 +284,11 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 %{_qt4_datadir}/mkspecs/features/qscintilla2.prf
 
 %if 0%{?python2}
-%files python
+%files -n python2-qscintilla
 %{python2_sitearch}/PyQt4/Qsci.*
 %{_qt4_datadir}/qsci/
 
-%files python-devel
+%files -n python2-qscintilla-devel
 %{_datadir}/sip/PyQt4/Qsci/
 %endif
 
@@ -319,6 +326,11 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 
 
 %changelog
+* Mon Apr 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 2.9.2-2
+- support bootstapping
+- rename qscintilla-python => python2-qscintilla
+- Provides: python(2|3)-PyQt(4|5)-Qsci
+
 * Mon Apr 18 2016 Rex Dieter <rdieter@fedoraproject.org> - 2.9.2-1
 - qscintilla-2.9.2