rpms/qscintilla/F-12 .cvsignore, 1.9, 1.10 qscintilla.spec, 1.31, 1.32 sources, 1.9, 1.10 QScintilla-gpl-2.4-autocomplete_popup.patch, 1.1, NONE

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3864

Modified Files:
	.cvsignore qscintilla.spec sources 
Removed Files:
	QScintilla-gpl-2.4-autocomplete_popup.patch 
Log Message:
* Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.2-1
- 2.4.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-12/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	17 Jun 2009 14:14:34 -0000	1.9
+++ .cvsignore	10 Feb 2010 16:25:28 -0000	1.10
@@ -1 +1 @@
-QScintilla-gpl-2.4.tar.gz
+QScintilla-gpl-2.4.2.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-12/qscintilla.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- qscintilla.spec	28 Nov 2009 01:24:47 -0000	1.31
+++ qscintilla.spec	10 Feb 2010 16:25:29 -0000	1.32
@@ -5,8 +5,8 @@
 %define python 1
 
 Name:    qscintilla
-Version: 2.4
-Release: 9%{?dist}
+Version: 2.4.2
+Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
 License: GPLv3 or GPLv2 with exceptions
@@ -18,8 +18,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 ## Upstreamable patches
 # posted to upstream ml, not in archive yet
 Patch50: QScintilla-gpl-2.4-qt4_designer_incpath.patch 
-# http://www.riverbankcomputing.com/pipermail/qscintilla/2009-October/000496.html
-Patch51: QScintilla-gpl-2.4-autocomplete_popup.patch
 
 Obsoletes: qscintilla-designer < 2.4-3
 Provides:  qscintilla-designer = %{version}-%{release}
@@ -29,7 +27,7 @@ BuildRequires:  qt4-devel
 # 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.6.1
+%global pyqt4_version 4.7 
 BuildRequires:  PyQt4-devel >= %{pyqt4_version} 
 BuildRequires:  sip-devel 
 BuildRequires:  chrpath
@@ -77,7 +75,6 @@ Obsoletes: qscintilla-python-devel < 2.4
 %setup -q -n QScintilla-gpl-%{version}
 
 %patch50 -p1 -b .qt4_designer_incpath
-%patch51 -p1 -b .autocomplete_popup
 
 # fix permissions on doc files
 find doc example-Qt4  -type f -exec chmod 0644 {} ';'
@@ -160,6 +157,16 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Jan 21 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.2-1
+- 2.4.2
+
+* Fri Jan 15 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.1-1
+- 2.4.1 
+- pyqt4_version 4.7
+
+* Thu Jan 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4-10 
+- rebuild (sip)
+
 * Fri Nov 27 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-9
 - -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api
 - -python-devel: Requires: sip-devel


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/F-12/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources	17 Jun 2009 14:14:34 -0000	1.9
+++ sources	10 Feb 2010 16:25:29 -0000	1.10
@@ -1 +1 @@
-dd69520ec91f1acb97a4eb74ddde37c9  QScintilla-gpl-2.4.tar.gz
+316dc8b53ec02548cae1c0d5acfa8ace  QScintilla-gpl-2.4.2.tar.gz


--- QScintilla-gpl-2.4-autocomplete_popup.patch DELETED ---