[qscintilla] 2.8.3-0.2.9b7b5393f228

[Rex Dieter]

commit 197fd33c8d0d82694940c0046b3296e16e723b37
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Wed Jun 4 07:23:11 2014 -0500

    2.8.3-0.2.9b7b5393f228
    
    - QScintilla-gpl-2.8.3-snapshot-9b7b5393f228
    - python: explicitly set QMAKEFEATURES (bug #1104559)

 .gitignore      |    3 +--
 qscintilla.spec |   41 +++++++++++++++++++++++++++++------------
 sources         |    2 +-
 3 files changed, 31 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2b9289f..56e5546 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-/QScintilla-gpl-2.8.1.tar.gz
-/QScintilla-gpl-2.8.3-snapshot-f7b1c9821894.tar.gz
+/QScintilla-gpl-2.8.3-snapshot-9b7b5393f228.tar.gz
diff --git a/qscintilla.spec b/qscintilla.spec
index 3fd659d..034f134 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -1,6 +1,6 @@
 
 %global scintilla_ver 3.3.6
-%define snap f7b1c9821894
+%global snap 9b7b5393f228
 
 # bootstrapping -python
 # undef python macros if you'd like to build qscintilla sans -python subpkg (which requires PyQt4)
@@ -12,13 +12,13 @@
 Summary: A Scintilla port to Qt
 Name:    qscintilla
 Version: 2.8.3
-Release: 0.1.%{snap}%{?dist}
+Release: 0.2.%{snap}%{?dist}
 
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
 Url:     http://www.riverbankcomputing.com/software/qscintilla/
 %if 0%{?snap:1}
-Source0  http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}-snapshot-%{snap}.tar.gz
+Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}-snapshot-%{snap}.tar.gz
 %else
 Source0: http://downloads.sf.net/pyqt/QScintilla-gpl-%{version}.tar.gz
 %endif
@@ -125,12 +125,11 @@ popd
 %if 0%{?python}
 cp -a Python Python2-qt4
 pushd Python2-qt4
+QMAKEFEATURES=../Qt4/features \
 %{__python2} \
   configure.py \
-    -c -j 3 \
-    -n ../Qt4 \
-    -o ../Qt4 \
-    --no-timestamp
+    --no-timestamp \
+    --qsci-incdir=../Qt4 --qsci-libdir=../Qt4
 
 make %{?_smp_mflags}
 popd
@@ -139,14 +138,13 @@ popd
 %if 0%{?python3}
 cp -a Python Python3-qt4
 pushd Python3-qt4
+QMAKEFEATURES=../Qt4/features \
 %{__python3} \
   configure.py \
-    -c -j 3 \
-    -n ../Qt4 \
-    -o ../Qt4 \
     --no-timestamp \
-    --sip=/usr/bin/python3-sip \
-    --pyqt-sipdir=/usr/share/python3-sip/PyQt4
+    --pyqt-sipdir=/usr/share/python3-sip/PyQt4 \
+    --qsci-incdir=../Qt4 --qsci-libdir=../Qt4 \
+    --sip=/usr/bin/python3-sip
 
 make %{?_smp_mflags}
 popd
@@ -175,9 +173,13 @@ make -C Qt4 install INSTALL_ROOT=%{buildroot}
 make -C designer-Qt4 install INSTALL_ROOT=%{buildroot}
 %if 0%{?python}
 make -C Python2-qt4 install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
+test -x   %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so || \
+chmod a+x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
 %endif
 %if 0%{?python3}
 make -C Python3-qt4 install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
+test -x   %{buildroot}%{python3_sitearch}/PyQt4/Qsci.so || \
+chmod a+x %{buildroot}%{python3_sitearch}/PyQt4/Qsci.so
 %endif
 
 %if 0%{?qt5}
@@ -191,6 +193,17 @@ rm -rfv %{buildroot}%{_qt4_datadir}/qsci/
 %endif
 
 
+%check
+# verify python module(s) permissions and libqscintilla2 linkage
+# https://bugzilla.redhat.com/show_bug.cgi?id=1104559
+ldd     %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so | grep libqscintilla2 || exit 1
+test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
+%if 0%{?python3}
+ldd     %{buildroot}%{python3_sitearch}/PyQt4/Qsci.so | grep libqscintilla2 || exit 1
+test -x %{buildroot}%{python2_sitearch}/PyQt4/Qsci.so
+%endif
+
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -244,6 +257,10 @@ rm -rfv %{buildroot}%{_qt4_datadir}/qsci/
 
 
 %changelog
+* Wed Jun 04 2014 Rex Dieter <rdieter at fedoraproject.org> - 2.8.3-0.2.9b7b5393f228
+- QScintilla-gpl-2.8.3-snapshot-9b7b5393f228
+- python: explicitly set QMAKEFEATURES (bug #1104559)
+
 * Mon Jun 02 2014 Rex Dieter <rdieter at fedoraproject.org> 2.8.3-0.1.f7b1c9821894
 - QScintiall-2.8.3-f7b1c9821894 snapshot (2.8.2 FTBFS)
 
diff --git a/sources b/sources
index f33e6f4..2970a11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2b6050c17ab9cf2a41fed35a26d5b445  QScintilla-gpl-2.8.3-snapshot-f7b1c9821894.tar.gz
+69a928cb0747f79efea9f7998ee4e077  QScintilla-gpl-2.8.3-snapshot-9b7b5393f228.tar.gz