|
@@ -3,7 +3,7 @@
|
|
|
|
|
|
%define ver 1.78
|
|
%define ver 1.78
|
|
|
|
|
|
-%define qt4_ver 4.6.1
|
|
+%define qt4_ver 4.6.3
|
|
%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
|
|
%define _qt4_prefix %(pkg-config --variable prefix --silence-errors Qt 2>/dev/null || echo %{_libdir}/qt-%{qt4_ver})
|
|
%define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
|
|
%define _qt4_libdir %(pkg-config --variable libdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/lib)
|
|
%define _qt4_includedir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/include)
|
|
%define _qt4_includedir %(pkg-config --variable headerdir --silence-errors Qt 2>/dev/null || echo %{_qt4_prefix}/include)
|
|
@@ -16,7 +16,7 @@
|
|
Summary: A Scintilla port to Qt
|
|
Summary: A Scintilla port to Qt
|
|
Name: qscintilla
|
|
Name: qscintilla
|
|
Version: 2.4.4
|
|
Version: 2.4.4
|
|
-Release: 1%{?_dist_release}
|
|
+Release: 2%{?_dist_release}
|
|
# matches up (pretty much) with qt4
|
|
# matches up (pretty much) with qt4
|
|
License: GPLv3 or GPLv2 with exceptions
|
|
License: GPLv3 or GPLv2 with exceptions
|
|
Group: Development/Tools
|
|
Group: Development/Tools
|
|
@@ -26,7 +26,7 @@ Source: QScintilla-gpl-%{version}.tar.gz
|
|
Patch1: QScintilla-2-gpl-Qt4-incpath.patch
|
|
Patch1: QScintilla-2-gpl-Qt4-incpath.patch
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
-BuildRequires: qt4-devel
|
|
+BuildRequires: qt4-devel = %{qt4_ver}
|
|
BuildRequires: PyQt4-devel >= %{pyqt4_version}
|
|
BuildRequires: PyQt4-devel >= %{pyqt4_version}
|
|
|
|
|
|
%description
|
|
%description
|
|
@@ -149,6 +149,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
%{_datadir}/sip/PyQt4/Qsci
|
|
%{_datadir}/sip/PyQt4/Qsci
|
|
|
|
|
|
%changelog
|
|
%changelog
|
|
|
|
+* Wed Aug 25 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.4.4-2
|
|
|
|
+- rebuild with qt4-4.6.3
|
|
|
|
+- fix qt4_ver from 4.6.1 to 4.6.3
|
|
|
|
+- fix BuildRequires: qt4-devel = %{qt4_ver} (add version)
|
|
|
|
+
|
|
* Sun Jul 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.4-1
|
|
* Sun Jul 25 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.4.4-1
|
|
- new upstream release
|
|
- new upstream release
|
|
- updated qt4 macros
|
|
- updated qt4 macros
|