From 6bc6d7123b52a767106d7753043f7f497fc6080f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 8 Mar 2017 12:13:56 -0600 Subject: [PATCH] no_rpath.patch --- qwt-6.1.3-no_rpath.patch | 12 ++++++++++++ qwt.spec | 8 +++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 qwt-6.1.3-no_rpath.patch diff --git a/qwt-6.1.3-no_rpath.patch b/qwt-6.1.3-no_rpath.patch new file mode 100644 index 0000000..af12336 --- /dev/null +++ b/qwt-6.1.3-no_rpath.patch @@ -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) { diff --git a/qwt.spec b/qwt.spec index 6774185..1c1d389 100644 --- a/qwt.spec +++ b/qwt.spec @@ -8,7 +8,7 @@ Name: qwt Summary: Qt Widgets for Technical Applications Version: 6.1.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2 with exceptions 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 # parallel-installable qt5 version Patch52: qwt-qt5.patch +# +Patch53: qwt-6.1.3-no_rpath.patch %if 0%{?qt5} BuildRequires: pkgconfig(Qt5Concurrent) pkgconfig(Qt5PrintSupport) pkgconfig(Qt5Widgets) @@ -84,6 +86,7 @@ Requires: %{name}-qt5%{?_isa} = %{version}-%{release} %patch50 -p1 -b .pkgconfig %patch51 -p1 -b .qt_install_paths %patch52 -p1 -b .qt5 +%patch53 -p1 -b .no_rpath %build @@ -181,6 +184,9 @@ cp -alf %{buildroot}%{_qt4_docdir}/html/qwt/ \ %changelog +* Wed Mar 08 2017 Rex Dieter - 6.1.3-2 +- no_rpath.patch + * Wed Mar 08 2017 Rex Dieter - 6.1.3-1 - qwt-6.1.3 (#1430378)