no_rpath.patch

epel9
Rex Dieter 8 years ago
parent 9bbc33b7a1
commit 6bc6d7123b

@ -0,0 +1,12 @@
diff -up qwt-6.1.3/designer/designer.pro.no_rpath qwt-6.1.3/designer/designer.pro
--- qwt-6.1.3/designer/designer.pro.no_rpath 2016-06-13 02:14:23.019600853 -0500
+++ qwt-6.1.3/designer/designer.pro 2017-03-08 12:11:49.591323453 -0600
@@ -83,7 +83,7 @@ contains(QWT_CONFIG, QwtDesigner) {
# compile the path for finding the Qwt library
# into the plugin. Not supported on Windows !
- QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
+ #QMAKE_RPATHDIR *= $${QWT_INSTALL_LIBS}
qwtAddLibrary($${QWT_OUT_ROOT}/lib, qwt)
contains(QWT_CONFIG, QwtDll) {

@ -8,7 +8,7 @@
Name: qwt Name: qwt
Summary: Qt Widgets for Technical Applications Summary: Qt Widgets for Technical Applications
Version: 6.1.3 Version: 6.1.3
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv2 with exceptions License: LGPLv2 with exceptions
URL: http://qwt.sourceforge.net URL: http://qwt.sourceforge.net
@ -23,6 +23,8 @@ Patch50: qwt-6.1.1-pkgconfig.patch
Patch51: qwt-6.1.2-qt_install_paths.patch Patch51: qwt-6.1.2-qt_install_paths.patch
# parallel-installable qt5 version # parallel-installable qt5 version
Patch52: qwt-qt5.patch Patch52: qwt-qt5.patch
#
Patch53: qwt-6.1.3-no_rpath.patch
%if 0%{?qt5} %if 0%{?qt5}
BuildRequires: pkgconfig(Qt5Concurrent) pkgconfig(Qt5PrintSupport) pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Concurrent) pkgconfig(Qt5PrintSupport) pkgconfig(Qt5Widgets)
@ -84,6 +86,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release}
%patch50 -p1 -b .pkgconfig %patch50 -p1 -b .pkgconfig
%patch51 -p1 -b .qt_install_paths %patch51 -p1 -b .qt_install_paths
%patch52 -p1 -b .qt5 %patch52 -p1 -b .qt5
%patch53 -p1 -b .no_rpath
%build %build
@ -181,6 +184,9 @@ cp -alf %{buildroot}%{_qt4_docdir}/html/qwt/ \
%changelog %changelog
* Wed Mar 08 2017 Rex Dieter <rdieter@fedoraproject.org> - 6.1.3-2
- no_rpath.patch
* Wed Mar 08 2017 Rex Dieter <rdieter@fedoraproject.org> - 6.1.3-1 * Wed Mar 08 2017 Rex Dieter <rdieter@fedoraproject.org> - 6.1.3-1
- qwt-6.1.3 (#1430378) - qwt-6.1.3 (#1430378)

Loading…
Cancel
Save