[packages/qscintilla2] - added mkspecs-dir patch, package qt5 mkspecs files where expected
qboosh
qboosh at pld-linux.org
Thu Nov 20 21:46:48 CET 2014
commit 1dd6bff8d68cb00d8e87bf8f87132a4d9afd0186
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Nov 20 21:47:29 2014 +0100
- added mkspecs-dir patch, package qt5 mkspecs files where expected
qscintilla2-mkspecs-dir.patch | 11 +++++++++++
qscintilla2.spec | 11 ++++++++---
2 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/qscintilla2.spec b/qscintilla2.spec
index 83e4e8f..6791d17 100644
--- a/qscintilla2.spec
+++ b/qscintilla2.spec
@@ -28,6 +28,7 @@ Patch1: %{name}-multiqt.patch
Patch2: %{name}-make.patch
Patch3: %{name}-outoftree.patch
Patch4: %{name}-qt5.patch
+Patch5: %{name}-mkspecs-dir.patch
URL: http://www.riverbankcomputing.co.uk/software/qscintilla/
%if %{with python2}
BuildRequires: python-sip-devel >= 2:%{sip_ver}
@@ -65,7 +66,9 @@ BuildRequires: python-PyQt5 >= %{pyqt5_ver}
BuildRequires: python3-PyQt5 >= %{pyqt5_ver}
%endif
%endif
-BuildConflicts: qscintilla2-devel
+BuildConflicts: qscintilla2-devel < %{version}
+%{?with_qt4:BuildConflicts: qscintilla2-qt4-devel < %{version}}
+%{?with_qt5:BuildConflicts: qscintilla2-qt5-devel < %{version}}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _sipfilesdir %{_datadir}/sip
@@ -288,12 +291,14 @@ Wiązania Pythona 3 dla komponentu QScintilla2 (wersja dla PyQt5).
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
for qt in %{?with_qt4:qt4} %{?with_qt5:qt5} ; do
install -d build-${qt}/{Qt4Qt5,designer-Qt4Qt5,Python2,Python3}
cd build-${qt}/Qt4Qt5
-qmake-${qt} ../../Qt4Qt5/qscintilla.pro
+qmake-${qt} ../../Qt4Qt5/qscintilla.pro \
+ $(test "$qt" = "qt4" || echo QMAKE_MKSPECS=%{_libdir}/$qt/mkspecs)
%{__make}
cd ../designer-Qt4Qt5
qmake-${qt} ../../designer-Qt4Qt5/designer.pro
@@ -449,7 +454,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libqscintilla2-qt5.so
%{_includedir}/qt5/Qsci
-%{_datadir}/qt5/mkspecs/features/qscintilla2.prf
+%{_libdir}/qt5/mkspecs/features/qscintilla2.prf
%files -n Qt5Designer-plugin-%{name}
%defattr(644,root,root,755)
diff --git a/qscintilla2-mkspecs-dir.patch b/qscintilla2-mkspecs-dir.patch
new file mode 100644
index 0000000..362b205
--- /dev/null
+++ b/qscintilla2-mkspecs-dir.patch
@@ -0,0 +1,11 @@
+--- QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro.orig 2014-11-20 20:54:22.727494808 +0100
++++ QScintilla-gpl-2.8.4/Qt4Qt5/qscintilla.pro 2014-11-20 21:01:46.424142856 +0100
+@@ -82,7 +82,7 @@
+ INSTALLS += header trans qsci target
+
+ greaterThan(QT_MAJOR_VERSION, 3) {
+- features.path = $$[QT_INSTALL_DATA]/mkspecs/features
++ features.path = $$[QMAKE_MKSPECS]/features
+ features.files = $$PWD/features/qscintilla2.prf
+ INSTALLS += features
+ }
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qscintilla2.git/commitdiff/1dd6bff8d68cb00d8e87bf8f87132a4d9afd0186
More information about the pld-cvs-commit
mailing list