[qscintilla] 2.7

[Rex Dieter]

commit c3cbaa890abbe23f8c6e198d23a71c3cc7cb5aa6
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Dec 17 08:23:38 2012 -0600

    2.7

 .gitignore      |    2 +-
 qscintilla.spec |   47 +++++++++++------------------------------------
 sources         |    2 +-
 3 files changed, 13 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index fea3e47..b443dad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 /QScintilla-gpl-2.5.1.tar.gz
-/QScintilla-gpl-2.6.1.tar.gz
 /QScintilla-gpl-2.6.2.tar.gz
+/QScintilla-gpl-2.7.tar.gz
diff --git a/qscintilla.spec b/qscintilla.spec
index 76b0b2e..335d055 100644
--- a/qscintilla.spec
+++ b/qscintilla.spec
@@ -1,40 +1,31 @@
 
-%global scintilla_ver 2.25 
+%global scintilla_ver 3.2.3
 
 # bootstrapping -python
 %global python 1
 
 Name:    qscintilla
-Version: 2.6.2
-Release: 3%{?dist}
+Version: 2.7
+Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
-Group:   Development/Tools
 Url:     http://www.riverbankcomputing.com/software/qscintilla/
-Source0: http://www.riverbankcomputing.com/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz  
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source0: http://downloads.sf.net/pyqt/QScintilla-gpl-%{version}.tar.gz
 
 ## Upstreamable patches
 # posted to upstream ml, not in archive yet
 Patch50: QScintilla-gpl-2.6.2-qt4qt5_designer_incpath.patch
 
-Obsoletes: qscintilla-designer < 2.4-3
-Provides:  qscintilla-designer = %{version}-%{release}
-%{?_isa:Provides: qscintilla-designer%{_isa} = %{version}-%{release}}
-
 BuildRequires: pkgconfig(QtDesigner) pkgconfig(QtGui) pkgconfig(QtScript) pkgconfig(QtXml)
 
 # for -python
 %if 0%{?python}
 %{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-%global pyqt4_version 4.7 
-BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
-BuildRequires:  sip-devel 
+BuildRequires: PyQt4-devel
 %endif
 
-
 %description
 QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
@@ -42,7 +33,6 @@ QScintilla is a port of Scintilla to the Qt GUI toolkit.
 
 %package devel
 Summary:  QScintilla Development Files
-Group:    Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: qt4-devel 
 %description devel
@@ -50,24 +40,16 @@ Requires: qt4-devel
 
 %package python
 Summary:  QScintilla PyQt4 bindings
-Group:    Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: PyQt4 >= %{pyqt4_version}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: PyQt4
 %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}}
 %description python
 %{summary}.
 
 %package python-devel
 Summary:  Development files for QScintilla PyQt4 bindings 
-Group:    Development/Libraries
 Requires: PyQt4-devel
-Requires: sip-devel
-%if 0%{?fedora} > 9 || 0%{?rhel} > 5
 BuildArch: noarch
-# when noarch landed
-Obsoletes: qscintilla-python-devel < 2.4-4
-%endif
-
 %description python-devel
 %{summary}.
 
@@ -105,8 +87,6 @@ popd
 
 
 %install
-rm -rf %{buildroot}
-
 make -C Qt4Qt5 install INSTALL_ROOT=%{buildroot} 
 make -C designer-Qt4 install INSTALL_ROOT=%{buildroot}
 %if 0%{?python}
@@ -114,41 +94,36 @@ make -C Python install DESTDIR=%{buildroot}
 %endif
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc NEWS README
 %doc LICENSE.GPL3 LICENSE.GPL2
 %doc GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT
-%{_qt4_libdir}/libqscintilla2.so.8*
+%{_qt4_libdir}/libqscintilla2.so.9*
 %{_qt4_plugindir}/designer/libqscintillaplugin.so
 %{_qt4_translationdir}/*
 %{_qt4_prefix}/qsci/
 
 %files devel
-%defattr(-,root,root,-)
 %doc doc/html-Qt4Qt5 doc/Scintilla example-Qt4Qt5
 %{_qt4_headerdir}/Qsci/
 %{_qt4_libdir}/libqscintilla2.so
 
 %if 0%{?python}
 %files python
-%defattr(-,root,root,-)
 %{python_sitearch}/PyQt4/Qsci.so
 
 %files python-devel
-%defattr(-,root,root,-)
 %{_datadir}/sip/PyQt4/Qsci/
 %endif
 
 
 %changelog
+* Mon Dec 17 2012 Rex Dieter <rdieter at fedoraproject.org> 2.7-1
+- 2.7
+
 * Mon Oct 01 2012 Rex Dieter <rdieter at fedoraproject.org> 2.6.2-3
 - rebuild (sip)
 
diff --git a/sources b/sources
index c981559..2557a77 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e6641b6f3863c01cc28c2d7bd2495f9  QScintilla-gpl-2.6.2.tar.gz
+a3857d75a2b332e0460131e0aa4cc4b5  QScintilla-gpl-2.7.tar.gz