From 8096e47ad02e0bedf7c2167522ecac4309f9c82c Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Jul 22 2018 16:07:48 +0000
Subject: fix build (adapt to related sip changes)


---

diff --git a/qscintilla.spec b/qscintilla.spec
index 63d22d4..c9010dd 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -1,6 +1,6 @@
 
 %global scintilla_ver 3.7.2
-%global sip_ver 4.19
+%global sip_ver 4.19.7
 
 # bootstrapping -python
 #global bootstrap 1
@@ -12,10 +12,18 @@
 %global qt4 1
 %global qt5 1
 
+# f29+ no longer using separate sipdir for python3
+%global py3_sipdir %{_datadir}/python3-sip
+%global py3_sip %{_bindir}/sip
+%if 0%{?fedora} > 28
+%global py3_sipdir %{_datadir}/sip
+%global py3_sip %{_bindir}/python3-sip
+%endif
+
 Summary: A Scintilla port to Qt
 Name:    qscintilla
 Version: 2.10.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv3
 Url:     http://www.riverbankcomputing.com/software/qscintilla/
@@ -194,10 +202,10 @@ cp -a Python Python3-qt4
 pushd Python3-qt4
 %{__python3} \
   configure.py \
-    --pyqt-sipdir=/usr/share/python3-sip/PyQt4 \
+    %{?py3_sipdir:--pyqt-sipdir=%{py3_sipdir}/PyQt4} \
+    %{?py3_sip:--sip=%{py3_sip}} \
     --qsci-incdir=../Qt4 --qsci-libdir=../Qt4 \
-    --no-dist-info \
-    --sip=/usr/bin/python3-sip
+    --no-dist-info
 
 %make_build
 popd
@@ -228,10 +236,8 @@ pushd Python2-qt5
 %{__python2} \
   configure.py \
     --pyqt=PyQt5 \
-    --pyqt-sipdir=/usr/share/sip/PyQt5 \
     --qsci-incdir=../Qt5 --qsci-libdir=../Qt5 \
-    --no-dist-info \
-    --sip=/usr/bin/sip
+    --no-dist-info
 
 %make_build
 popd
@@ -243,10 +249,10 @@ pushd Python3-qt5
 %{__python3} \
   configure.py \
     --pyqt=PyQt5 \
-    --pyqt-sipdir=/usr/share/python3-sip/PyQt5 \
+    %{?py3_sipdir:--pyqt-sipdir=%{py3_sipdir}/PyQt4} \
+    %{?py3_sip:--sip=%{py3_sip}} \
     --qsci-incdir=../Qt5 --qsci-libdir=../Qt5 \
-    --no-dist-info \
-    --sip=/usr/bin/python3-sip
+    --no-dist-info
 
 %make_build
 popd
@@ -291,8 +297,12 @@ chmod a+x %{buildroot}%{python3_sitearch}/PyQt5/Qsci.so
 %endif
 
 %find_lang qscintilla --with-qt
+%if 0%{?qt4}
 grep "%{_qt4_translationdir}" qscintilla.lang > qscintilla-qt4.lang
+%endif
+%if 0%{?qt5}
 grep "%{_qt5_translationdir}" qscintilla.lang > qscintilla-qt5.lang
+%endif
 
 # unpackaged files
 %if !0%{?python2}
@@ -348,7 +358,7 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 %{_qt4_datadir}/qsci/
 
 %files -n python3-qscintilla-devel
-%{_datadir}/python3-sip/PyQt4/Qsci/
+%{py3_sipdir}/PyQt4/Qsci/
 %endif
 %endif
 
@@ -384,12 +394,15 @@ test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 %{_qt5_datadir}/qsci/
 
 %files -n python3-qscintilla-qt5-devel
-%{_datadir}/python3-sip/PyQt5/Qsci/
+%{_py3_sipdir}/PyQt5/Qsci/
 %endif
 %endif
 
 
 %changelog
+* Sun Jul 22 2018 Rex Dieter <rdieter@fedoraproject.org> - 2.10.7-3
+- fix build (adapt to related sip changes)
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild