diff --git a/.cvsignore b/.cvsignore index 07a120f..7f084a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -QScintilla-gpl-2.4.2.tar.gz +QScintilla-gpl-2.4.3.tar.gz diff --git a/qscintilla.spec b/qscintilla.spec index fc87a4c..c76d4f0 100644 --- a/qscintilla.spec +++ b/qscintilla.spec @@ -5,7 +5,7 @@ %define python 1 Name: qscintilla -Version: 2.4.2 +Version: 2.4.3 Release: 1%{?dist} Summary: A Scintilla port to Qt # matches up (pretty much) with qt4 @@ -27,8 +27,10 @@ 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 -BuildRequires: PyQt4-devel >= %{pyqt4_version} +%endif +BuildRequires: PyQt4-devel%{?pyqt4_version: >= %{pyqt4_version}} BuildRequires: sip-devel BuildRequires: chrpath %endif @@ -51,7 +53,7 @@ Requires: qt4-devel Summary: QScintilla PyQt4 bindings Group: Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: PyQt4 >= %{pyqt4_version} +Requires: PyQt4%{?pyqt4_version: >= %{pyqt4_version}} %{?_sip_api:Requires: sip-api(%{_sip_api_major}) >= %{_sip_api}} %description python %{summary}. @@ -61,7 +63,7 @@ Summary: Development files for QScintilla PyQt4 bindings Group: Development/Libraries Requires: PyQt4-devel Requires: sip-devel -%if 0%{?fedora} > 9 +%if 0%{?fedora} > 9 || 0%{?rhel} > 5 BuildArch: noarch # when noarch landed Obsoletes: qscintilla-python-devel < 2.4-4 @@ -131,9 +133,9 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) -%doc ChangeLog NEWS README -%doc LICENSE.GPL3 -%doc LICENSE.GPL2 GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT +%doc NEWS README +%doc LICENSE.GPL3 LICENSE.GPL2 +%doc GPL_EXCEPTION.TXT GPL_EXCEPTION_ADDENDUM.TXT %{_qt4_libdir}/libqscintilla2.so.5* %{_qt4_plugindir}/designer/libqscintillaplugin.so %{_qt4_translationdir}/* @@ -157,6 +159,9 @@ 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 diff --git a/sources b/sources index c4761b3..1ecf378 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -316dc8b53ec02548cae1c0d5acfa8ace QScintilla-gpl-2.4.2.tar.gz +b1c83d42398493bedb22f4df1868627d QScintilla-gpl-2.4.3.tar.gz