rpms/qscintilla/EL-6 QScintilla-gpl-2.4-autocomplete_popup.patch, 1.2, 1.3 .cvsignore, 1.11, 1.12 qscintilla.spec, 1.33, 1.34 sources, 1.11, 1.12

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/qscintilla/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17881

Modified Files:
	.cvsignore qscintilla.spec sources 
Added Files:
	QScintilla-gpl-2.4-autocomplete_popup.patch 
Log Message:
* Sun May 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
- QScintilla-gpl-2.4
- build for rhel6
- autocomplete_popup patch
- -python-devel: make noarch, drop dep on -python
- include designer plugin in main pkg, Obsoletes: qscintilla-designer


QScintilla-gpl-2.4-autocomplete_popup.patch:
 SciClasses.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: QScintilla-gpl-2.4-autocomplete_popup.patch
===================================================================
RCS file: QScintilla-gpl-2.4-autocomplete_popup.patch
diff -N QScintilla-gpl-2.4-autocomplete_popup.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ QScintilla-gpl-2.4-autocomplete_popup.patch	9 May 2010 16:01:11 -0000	1.3
@@ -0,0 +1,12 @@
+diff -up QScintilla-gpl-2.4/Qt4/SciClasses.cpp.autocomplete_popup QScintilla-gpl-2.4/Qt4/SciClasses.cpp
+--- QScintilla-gpl-2.4/Qt4/SciClasses.cpp.autocomplete_popup	2009-06-05 04:00:41.000000000 -0500
++++ QScintilla-gpl-2.4/Qt4/SciClasses.cpp	2009-10-21 07:56:58.804972430 -0500
+@@ -128,7 +128,7 @@ void SciPopup::on_triggered(int cmd)
+ SciListBox::SciListBox(QWidget *parent, ListBoxQt *lbx_)
+     : QListWidget(parent), lbx(lbx_)
+ {
+-    setWindowFlags(Qt::Tool|Qt::FramelessWindowHint);
++    setWindowFlags(Qt::ToolTip|Qt::WindowStaysOnTopHint);
+     setAttribute(Qt::WA_StaticContents);
+ 
+     setFocusProxy(parent);


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/EL-6/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- .cvsignore	9 May 2010 15:06:32 -0000	1.11
+++ .cvsignore	9 May 2010 16:01:11 -0000	1.12
@@ -1 +1 @@
-QScintilla-gpl-2.4.3.tar.gz
+QScintilla-gpl-2.4.tar.gz


Index: qscintilla.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/EL-6/qscintilla.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- qscintilla.spec	9 May 2010 15:06:32 -0000	1.33
+++ qscintilla.spec	9 May 2010 16:01:12 -0000	1.34
@@ -5,7 +5,7 @@
 %define python 1
 
 Name:    qscintilla
-Version: 2.4.3
+Version: 2.4
 Release: 1%{?dist}
 Summary: A Scintilla port to Qt
 # matches up (pretty much) with qt4
@@ -19,7 +19,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version
 # posted to upstream ml, not in archive yet
 Patch50: QScintilla-gpl-2.4-qt4_designer_incpath.patch 
 
-Obsoletes: qscintilla-designer < 2.4-3
+Obsoletes: qscintilla-designer < 2.4-1
 Provides:  qscintilla-designer = %{version}-%{release}
 
 BuildRequires:  qt4-devel
@@ -27,9 +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)")}
-%if 0%{?fedora}
-%global pyqt4_version 4.7 
-%endif
+
 BuildRequires:  PyQt4-devel%{?pyqt4_version: >= %{pyqt4_version}}
 BuildRequires:  sip-devel 
 BuildRequires:  chrpath
@@ -63,12 +61,7 @@ Summary:  Development files for QScintil
 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}.
 
@@ -159,47 +152,13 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Thu Mar 18 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4.3-1
-- 2.4.3
-
-* 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
-
-* Mon Nov 23 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-8 
-- rebuild (for qt-4.6.0-rc1, f13+)
-
-* Wed Nov 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-7
-- pyqt4_version 4.6.1
-
-* Wed Oct 21 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-6
+* Sun May 09 2010 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
+- QScintilla-gpl-2.4
+- build for rhel6
 - autocomplete_popup patch
-
-* Fri Oct 16 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-5
-- rebuild (PyQt4)
-
-* Tue Aug 11 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-4
 - -python-devel: make noarch, drop dep on -python
-
-* Sat Aug 08 2009 Rex Dieter <rdieter at fedoraproject.org - 2.4-3
 - include designer plugin in main pkg, Obsoletes: qscintilla-designer
 
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Jun 17 2009 Rex Dieter <rdieter at fedoraproject.org> - 2.4-1
-- QScintilla-gpl-2.4
-
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.3.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/qscintilla/EL-6/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- sources	9 May 2010 15:06:32 -0000	1.11
+++ sources	9 May 2010 16:01:12 -0000	1.12
@@ -1 +1 @@
-b1c83d42398493bedb22f4df1868627d  QScintilla-gpl-2.4.3.tar.gz
+dd69520ec91f1acb97a4eb74ddde37c9  QScintilla-gpl-2.4.tar.gz