- updated to 2.5.1 (note: new soname)

Changed files:
    qscintilla2.spec -> 1.36

diff --git a/qscintilla2.spec b/qscintilla2.spec
index 7664016d0938dab5d22728fb43f8cb1335911c7f..409a6a64a8cf1fa0046aa5fcab5a5268683eb778 100644 (file)
--- a/qscintilla2.spec
+++ b/qscintilla2.spec
@@ -1,17 +1,16 @@
 #
-# TODO:
-#      - QScintilla2 for Qt3
+# TODO: QScintilla2 for Qt3 (does it make any sense nowadays?)
 #
-%define                scintilla_ver   1.78
+%define                scintilla_ver   2.25
 Summary:       QScintilla2 - a port to Qt of the Scintilla editing component
 Summary(pl.UTF-8):     QScintilla2 - port komponentu edytora Scintilla dla biblioteki Qt
 Name:          qscintilla2
-Version:       2.4.6
-Release:       3
+Version:       2.5.1
+Release:       1
 License:       GPL v2 or GPL v3 with Riverbank GPL Exception v1.1
 Group:         X11/Libraries
 Source0:       http://www.riverbankcomputing.co.uk/static/Downloads/QScintilla2/QScintilla-gpl-%{version}.tar.gz
-# Source0-md5: 424a89736b900e6ca5bc6d929cdafaf8
+# Source0-md5: dd7edef5ff674d307057a3c12dbd8fce
 Patch0:                %{name}-internal_build.patch
 URL:           http://www.riverbankcomputing.co.uk/software/qscintilla/
 BuildRequires: QtDesigner-devel
@@ -71,7 +70,6 @@ Summary(pl.UTF-8):    Wiązania Pythona dla komponentu QScintilla2
 Group:         Libraries/Python
 Requires:      %{name} = %{version}-%{release}
 %requires_ge  python-PyQt4
-# Requires:   python-PyQt4 >= 0:4.7.4
 
 %description -n python-%{name}
 Python bindings for the QScintilla2.
@@ -84,7 +82,7 @@ Summary:      Python bindings for the QScintilla2 - development files
 Summary(pl.UTF-8):     Wiązania Pythona dla komponentu QScintilla2 - pliki programistyczne
 Group:         Development/Languages/Python
 Requires:      python-%{name} = %{version}-%{release}
-Requires:      python-PyQt4-devel >= 4.1.1
+Requires:      python-PyQt4-devel >= 4.8.2
 
 %description -n python-%{name}-devel
 Python bindings for the QScintilla2 - development files.
@@ -108,7 +106,7 @@ qmake-qt4 designer.pro
 cd -
 
 cd Python
-python configure.py \
+%{__python} configure.py \
        -c -j 3 \
        -n ../Qt4 \
        -o ../Qt4
@@ -143,7 +141,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc GPL_EXCEPTION.TXT NEWS OPENSOURCE-NOTICE.TXT README
 %attr(755,root,root) %{_libdir}/libqscintilla2.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libqscintilla2.so.5
+%attr(755,root,root) %ghost %{_libdir}/libqscintilla2.so.6
 %lang(cs) %{_datadir}/locale/cs/LC_MESSAGES/qscintilla2.qm
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/qscintilla2.qm
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/qscintilla2.qm
@@ -160,6 +158,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/qt4/Qsci
 
 %files -n QtDesigner-plugin-%{name}
+%defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/qt4/plugins/designer/libqscintillaplugin.so
 
 %files -n python-%{name}