commit 12c2edc9e6bed557b1dc0172f1ea9638d1689e5f
Author: Jakub Bogusz <[email protected]>
Date: Mon Dec 31 18:06:55 2018 +0100
- adjusted qtlockedfile.prf for qt5 compatibility; release 5
QtLockedFile.spec | 5 +++--
qtlockedfile.prf | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/QtLockedFile.spec b/QtLockedFile.spec
index e193a12..3260ebd 100644
--- a/QtLockedFile.spec
+++ b/QtLockedFile.spec
@@ -10,7 +10,7 @@ Summary: QFile extension with advisory locking functions
Summary(pl.UTF-8): Rozszerzenie QFile z funkcjami do blokowania doradczego
Name: QtLockedFile
Version: 2.4
-Release: 4
+Release: 5
License: GPL v3 or LGPL v2 with exceptions
Group: Libraries
# git clone [email protected]:qt-solutions/qt-solutions.git
@@ -154,7 +154,8 @@ cp -p %{SOURCE1} $RPM_BUILD_ROOT%{qt4dir}/mkspecs/features
install -d
$RPM_BUILD_ROOT{%{_includedir}/qt5/QtSolutions,%{qt5dir}/mkspecs/features}
%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*-%{version}.so.1.0
cp -p src/qtlockedfile.h src/QtLockedFile
$RPM_BUILD_ROOT%{_includedir}/qt5/QtSolutions
-%{__sed} -e 's/-lQtSolutions/-lQt5Solutions/' %{SOURCE1}
>$RPM_BUILD_ROOT%{qt5dir}/mkspecs/features/qtlockedfile.prf
+%{__sed} -e 's/-lQtSolutions/-lQt5Solutions/' \
+ -e 's/QMAKE_INCDIR_QT/QT_MODULE_INCLUDE_BASE/' %{SOURCE1}
>$RPM_BUILD_ROOT%{qt5dir}/mkspecs/features/qtlockedfile.prf
%endif
%clean
diff --git a/qtlockedfile.prf b/qtlockedfile.prf
index 970db04..4696367 100644
--- a/qtlockedfile.prf
+++ b/qtlockedfile.prf
@@ -1,3 +1,3 @@
-INCLUDEPATH *= $$QMAKE_INCDIR_QT/QtSolutions
-DEPENDPATH *= $$QMAKE_INCDIR_QT/QtSolutions
+INCLUDEPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
+DEPENDPATH *= $$[QT_INSTALL_HEADERS]/QtSolutions
LIBS *= -lQtSolutions_LockedFile-2.4
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/QtLockedFile.git/commitdiff/12c2edc9e6bed557b1dc0172f1ea9638d1689e5f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
