From 7fe663d589baa004431ffaa87f7b655fd6a97507 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@math.unl.edu>
Date: Jun 02 2014 17:01:21 +0000
Subject: QScintiall-2.8.3-f7b1c9821894 snapshot (2.8.2 FTBFS)


---

diff --git a/.gitignore b/.gitignore
index 0235a5a..2b9289f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /QScintilla-gpl-2.8.1.tar.gz
+/QScintilla-gpl-2.8.3-snapshot-f7b1c9821894.tar.gz
diff --git a/QScintilla-gpl-2.8.1-api_path.patch b/QScintilla-gpl-2.8.1-api_path.patch
deleted file mode 100644
index 4abb37c..0000000
--- a/QScintilla-gpl-2.8.1-api_path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up QScintilla-gpl-2.8.1/Python/configure.py.api_path QScintilla-gpl-2.8.1/Python/configure.py
---- QScintilla-gpl-2.8.1/Python/configure.py.api_path	2014-03-16 14:03:35.875522817 -0500
-+++ QScintilla-gpl-2.8.1/Python/configure.py	2014-03-16 14:04:32.008925903 -0500
-@@ -314,7 +314,7 @@ class TargetConfiguration:
-                 # Qt v4.
-                 self.qmake_spec = 'macx-g++'
- 
--        self.api_dir = qt_config.QT_INSTALL_DATA
-+        self.api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
-         self.qsci_default_inc_dir = qt_config.QT_INSTALL_HEADERS
-         self.qsci_inc_dir = None
-         self.qsci_default_lib_dir = qt_config.QT_INSTALL_LIBS
diff --git a/QScintilla-gpl-2.8.3-api_path.patch b/QScintilla-gpl-2.8.3-api_path.patch
new file mode 100644
index 0000000..9d1e189
--- /dev/null
+++ b/QScintilla-gpl-2.8.3-api_path.patch
@@ -0,0 +1,12 @@
+diff -up QScintilla-gpl-2.8.3-snapshot-f7b1c9821894/Python/configure.py.api_path QScintilla-gpl-2.8.3-snapshot-f7b1c9821894/Python/configure.py
+--- QScintilla-gpl-2.8.3-snapshot-f7b1c9821894/Python/configure.py.api_path	2014-06-02 07:15:48.770572316 -0500
++++ QScintilla-gpl-2.8.3-snapshot-f7b1c9821894/Python/configure.py	2014-06-02 07:16:44.236983605 -0500
+@@ -907,7 +907,7 @@ class _TargetConfiguration:
+                 self.qmake_spec = 'macx-g++'
+ 
+         self.qt_version_str = getattr(qt_config, 'QT_VERSION', '')
+-        self.api_dir = qt_config.QT_INSTALL_DATA
++        self.api_dir = os.path.join(qt_config.QT_INSTALL_DATA, 'qsci')
+         self.qt_inc_dir = qt_config.QT_INSTALL_HEADERS
+         self.qt_lib_dir = qt_config.QT_INSTALL_LIBS
+ 
diff --git a/qscintilla.spec b/qscintilla.spec
index b4f5617..3fd659d 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -1,5 +1,6 @@
 
 %global scintilla_ver 3.3.6
+%define snap f7b1c9821894
 
 # bootstrapping -python
 # undef python macros if you'd like to build qscintilla sans -python subpkg (which requires PyQt4)
@@ -10,16 +11,20 @@
 
 Summary: A Scintilla port to Qt
 Name:    qscintilla
-Version: 2.8.1
-Release: 4%{?dist}
+Version: 2.8.3
+Release: 0.1.%{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
+%else
 Source0: http://downloads.sf.net/pyqt/QScintilla-gpl-%{version}.tar.gz
+%endif
 
 ## Upstreamable patches
-Patch51: QScintilla-gpl-2.8.1-api_path.patch
+Patch51: QScintilla-gpl-2.8.3-api_path.patch
 
 BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml)
 %if 0%{?qt5}
@@ -42,6 +47,7 @@ Requires: qt4-devel
 %package python
 Summary:  QScintilla python bindings
 BuildRequires: PyQt4-devel
+BuildRequires: sip-devel >= 3.16
 Provides: python-qscintilla = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: PyQt4
@@ -62,6 +68,7 @@ BuildArch: noarch
 %package -n python3-qscintilla
 Summary:  QScintilla python3 bindings
 BuildRequires: python3-PyQt4-devel
+BuildRequires: sip-devel >= 3.16
 Provides: %{name}-python3 = %{version}-%{release}
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: python3-PyQt4
@@ -88,22 +95,18 @@ Summary: A Scintilla port to Qt5
 Summary:  QScintilla Development Files
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt5-qtbase-devel
-%description devel
+%description qt5-devel
 %{summary}.
 %endif
 
 
 %prep
-%setup -q -n QScintilla-gpl-%{version}
+%setup -n QScintilla-gpl-%{version}%{?snap:-snapshot-%{snap}}
 
 %patch51 -p1 -b .api_path
 
-# fix line endings in license file(s)
-sed -i 's/\r//' LICENSE.GPL2 GPL_EXCEPTION_ADDENDUM.TXT
-
 
 %build
-
 PATH=%{_qt4_bindir}:$PATH; export PATH
 
 cp -a Qt4Qt5 Qt4/
@@ -241,6 +244,9 @@ rm -rfv %{buildroot}%{_qt4_datadir}/qsci/
 
 
 %changelog
+* Mon Jun 02 2014 Rex Dieter <rdieter@fedoraproject.org> 2.8.3-0.1.f7b1c9821894
+- QScintiall-2.8.3-f7b1c9821894 snapshot (2.8.2 FTBFS)
+
 * Wed May 28 2014 Kalev Lember <kalevlember@gmail.com> - 2.8.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
 
diff --git a/sources b/sources
index 73776c6..f33e6f4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bbf4725583ee9817f89413dca6cd38d2  QScintilla-gpl-2.8.1.tar.gz
+2b6050c17ab9cf2a41fed35a26d5b445  QScintilla-gpl-2.8.3-snapshot-f7b1c9821894.tar.gz