From 8b970a77c3177d6b85c40bdece4dd3b88f4eb656 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: May 09 2010 16:01:12 +0000 Subject: - 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 --- diff --git a/.cvsignore b/.cvsignore index 7f084a7..3349ba3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -QScintilla-gpl-2.4.3.tar.gz +QScintilla-gpl-2.4.tar.gz diff --git a/QScintilla-gpl-2.4-autocomplete_popup.patch b/QScintilla-gpl-2.4-autocomplete_popup.patch new file mode 100644 index 0000000..885452c --- /dev/null +++ b/QScintilla-gpl-2.4-autocomplete_popup.patch @@ -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); diff --git a/qscintilla.spec b/qscintilla.spec index c76d4f0..11730c3 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -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}-%{release}-root-%(%{__id_u} -n) # 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 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}. @@ -159,47 +152,13 @@ rm -rf %{buildroot} %changelog -* Thu Mar 18 2010 Rex Dieter - 2.4.3-1 -- 2.4.3 - -* Thu Jan 21 2010 Rex Dieter - 2.4.2-1 -- 2.4.2 - -* Fri Jan 15 2010 Rex Dieter - 2.4.1-1 -- 2.4.1 -- pyqt4_version 4.7 - -* Thu Jan 07 2010 Rex Dieter - 2.4-10 -- rebuild (sip) - -* Fri Nov 27 2009 Rex Dieter - 2.4-9 -- -python: Requires: sip-api(%%_sip_api_major) >= %%_sip_api -- -python-devel: Requires: sip-devel - -* Mon Nov 23 2009 Rex Dieter - 2.4-8 -- rebuild (for qt-4.6.0-rc1, f13+) - -* Wed Nov 11 2009 Rex Dieter - 2.4-7 -- pyqt4_version 4.6.1 - -* Wed Oct 21 2009 Rex Dieter - 2.4-6 +* Sun May 09 2010 Rex Dieter - 2.4-1 +- QScintilla-gpl-2.4 +- build for rhel6 - autocomplete_popup patch - -* Fri Oct 16 2009 Rex Dieter - 2.4-5 -- rebuild (PyQt4) - -* Tue Aug 11 2009 Rex Dieter - 2.4-4 - -python-devel: make noarch, drop dep on -python - -* Sat Aug 08 2009 Rex Dieter - 2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Jun 17 2009 Rex Dieter - 2.4-1 -- QScintilla-gpl-2.4 - * Wed Feb 25 2009 Fedora Release Engineering - 2.3.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 1ecf378..7db981a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1c83d42398493bedb22f4df1868627d QScintilla-gpl-2.4.3.tar.gz +dd69520ec91f1acb97a4eb74ddde37c9 QScintilla-gpl-2.4.tar.gz