|
@@ -1,22 +1,23 @@
|
|
|
%{!?python_sitearch:%global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
|
|
|
-%global pyqt4_version 4.9
|
|
|
+%global pyqt4_version 4.11.2
|
|
|
|
|
|
-%define ver 2.29
|
|
|
+%define ver 3.3.6
|
|
|
|
|
|
-%define _qt4_version 4.8.0
|
|
|
+%define _qt4_version 4.8.6
|
|
|
%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt4)
|
|
|
%define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_libdir})
|
|
|
%define _qt4_headerdir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_includedir})
|
|
|
%define _qt4_translationdir %(pkg-config --variable translationdir --silence-errors Qt 2>/dev/null || echo %{_datadir}/qt4/translations)
|
|
|
|
|
|
Summary: A Scintilla port to Qt
|
|
|
+Summary(ja): Scintilla の Qt への移植版
|
|
|
Name: qscintilla
|
|
|
-Version: 2.6
|
|
|
+Version: 2.8.4
|
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
# matches up (pretty much) with qt4
|
|
|
License: GPLv3 or GPLv2 with exceptions
|
|
|
-Group: Development/Tools
|
|
|
+Group: System Environment/Libraries
|
|
|
URL: http://www.riverbankcomputing.co.uk/qscintilla
|
|
|
|
|
|
Source: QScintilla-gpl-%{version}.tar.gz
|
|
@@ -26,6 +27,7 @@ Patch1: QScintilla-2-gpl-Qt4-incpath.patch
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: qt4-devel
|
|
|
BuildRequires: PyQt4-devel >= %{pyqt4_version}
|
|
|
+BuildRequires: sip-devel
|
|
|
Requires: qt4 >= %{_qt4_version}
|
|
|
|
|
|
%description
|
|
@@ -35,7 +37,8 @@ This version of QScintilla is based on Scintilla v%{ver}.
|
|
|
|
|
|
%package designer
|
|
|
Summary: QScintilla designer plugin
|
|
|
-Group: Development/Tools
|
|
|
+Summary(ja): QScintilla デザイナプラグイン
|
|
|
+Group: System Environment/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: qt4-designer
|
|
|
|
|
@@ -44,6 +47,7 @@ Requires: qt4-designer
|
|
|
|
|
|
%package devel
|
|
|
Summary: QScintilla Development Files
|
|
|
+Summary(ja): QScintilla 開発用ファイル
|
|
|
Group: Development/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: qt4-devel >= %{_qt4_version}
|
|
@@ -53,16 +57,19 @@ This packages contains the libraries, include and other files
|
|
|
you can use to develop applications with QScintilla.
|
|
|
|
|
|
%package python
|
|
|
-Summary: QScintilla PyQt4 bindings
|
|
|
-Group: Development/Libraries
|
|
|
+Summary: QScintilla python bindings
|
|
|
+Summary(ja): QScintilla の Python バインディング
|
|
|
+Group: System Environment/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
Requires: PyQt4 >= %{pyqt4_version}
|
|
|
+Provides: python-qscintilla = %{version}-%{release}
|
|
|
|
|
|
%description python
|
|
|
%{summary}.
|
|
|
|
|
|
%package python-devel
|
|
|
-Summary: Development files for QScintilla PyQt4 bindings
|
|
|
+Summary: Development files for QScintilla python bindings
|
|
|
+Summary(ja): QScintilla の Python バインディングの開発用ファイル
|
|
|
Group: Development/Libraries
|
|
|
Requires: %{name}-python = %{version}-%{release}
|
|
|
Requires: PyQt4-devel >= %{pyqt4_version}
|
|
@@ -72,10 +79,9 @@ Requires: PyQt4-devel >= %{pyqt4_version}
|
|
|
|
|
|
%prep
|
|
|
%setup -q -n QScintilla-gpl-%{version}
|
|
|
-%patch1 -p1 -b .designer-incpath-qt4
|
|
|
|
|
|
# fix permissions on doc files
|
|
|
-find doc example-Qt4 -type f -exec chmod 0644 {} ';'
|
|
|
+find doc example-Qt4Qt5 -type f -exec chmod 0644 {} ';'
|
|
|
find src include -type f -exec chmod 0644 {} ';'
|
|
|
|
|
|
# fix line endings in license file(s)
|
|
@@ -89,30 +95,31 @@ export QMAKESPEC=$QTDIR/mkspecs/linux-g++-64/
|
|
|
export QMAKESPEC=$QTDIR/mkspecs/linux-g++/
|
|
|
%endif
|
|
|
|
|
|
-pushd Qt4
|
|
|
+cd Qt4Qt5
|
|
|
$QTDIR/bin/qmake -o Makefile qscintilla.pro
|
|
|
make %{?_smp_mflags}
|
|
|
-popd
|
|
|
+cd ..
|
|
|
|
|
|
-pushd designer-Qt4
|
|
|
-$QTDIR/bin/qmake -o Makefile designer.pro
|
|
|
+cd designer-Qt4Qt5
|
|
|
+QMAKEFEATURES=../Qt4Qt5/features \
|
|
|
+$QTDIR/bin/qmake -o Makefile designer.pro INCLUDEPATH+=../Qt4Qt5 LIBS+=-L../Qt4Qt5
|
|
|
make %{?_smp_mflags}
|
|
|
-popd
|
|
|
+cd ..
|
|
|
|
|
|
-pushd Python
|
|
|
+cd Python
|
|
|
%{__python} configure.py \
|
|
|
- -c -j 3 \
|
|
|
- -n ../Qt4 \
|
|
|
- -o ../Qt4
|
|
|
+ --no-timestamp \
|
|
|
+ --qsci-incdir=../Qt4Qt5 \
|
|
|
+ --qsci-libdir=../Qt4Qt5
|
|
|
make %{?_smp_mflags}
|
|
|
-popd
|
|
|
+cd ..
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
-make install INSTALL_ROOT=$RPM_BUILD_ROOT -C Qt4
|
|
|
-make install INSTALL_ROOT=$RPM_BUILD_ROOT -C designer-Qt4
|
|
|
-make install DESTDIR=$RPM_BUILD_ROOT -C Python
|
|
|
+make install INSTALL_ROOT=$RPM_BUILD_ROOT -C Qt4Qt5
|
|
|
+make install INSTALL_ROOT=$RPM_BUILD_ROOT -C designer-Qt4Qt5
|
|
|
+make install INSTALL_ROOT=$RPM_BUILD_ROOT DESTDIR=$RPM_BUILD_ROOT -C Python
|
|
|
|
|
|
|
|
|
%clean
|
|
@@ -138,6 +145,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%defattr(-, root, root, -)
|
|
|
%{_qt4_headerdir}/*
|
|
|
%{_qt4_libdir}/libqscintilla2.so
|
|
|
+%{_qt4_prefix}/mkspecs/features/qscintilla2.prf
|
|
|
|
|
|
%files python
|
|
|
%defattr(-,root,root,-)
|
|
@@ -148,6 +156,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%{_datadir}/sip/PyQt4/Qsci
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Nov 8 2014 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.2-1
|
|
|
+- new upstream release
|
|
|
+- built with qt-4.8.6, PyQt4-4.11.2
|
|
|
+
|
|
|
* Sat Jan 7 2012 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.6-1
|
|
|
- new upstream release
|
|
|
- built with qt-4.8.0, PyQt4-4.9
|
|
@@ -192,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
* Thu Sep 13 2007 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.7.1-0vl1
|
|
|
- new upstream release (1.71)
|
|
|
|
|
|
-* Mon Jun 4 2006 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6-0vl1
|
|
|
+* Sun Jun 4 2006 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 1.6-0vl1
|
|
|
- new upstream release (1.65)
|
|
|
- changed Group to System Environment/Libraries
|
|
|
|