From fb0ef7686da6313f451af225662577c0db0a69b2 Mon Sep 17 00:00:00 2001 From: zou_lin77 <422351577@qq.com> Date: Mon, 7 Mar 2022 18:47:44 +0800 Subject: [PATCH] remove rpath --- ...generated-configure-to-disable-rpath.patch | 27 +++++++++++++++++++ pinentry.spec | 7 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 Update-also-generated-configure-to-disable-rpath.patch diff --git a/Update-also-generated-configure-to-disable-rpath.patch b/Update-also-generated-configure-to-disable-rpath.patch new file mode 100644 index 0000000..684670b --- /dev/null +++ b/Update-also-generated-configure-to-disable-rpath.patch @@ -0,0 +1,27 @@ +From 8031753da4bed81fd133dceff8187f0e86e02f3f Mon Sep 17 00:00:00 2001 +From: Jakub Jelen +Date: Fri, 16 Apr 2021 09:13:43 +0200 +Subject: [PATCH] Update also generated configure to disable rpath + +as we do not run autogen.sh to regenerate configure, it is still needed +--- + configure | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/configure b/configure +index d3b6f42..9d3607e 100755 +--- a/configure ++++ b/configure +@@ -10765,7 +10765,9 @@ fi + + qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core` + if test -n "$qtlibdir"; then ++ if test "$enable_rpath" != "no"; then + PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\"" ++ fi + fi + + if test -n "$ac_tool_prefix"; then +-- +1.8.3.1 + diff --git a/pinentry.spec b/pinentry.spec index 895f5bc..7c6734d 100644 --- a/pinentry.spec +++ b/pinentry.spec @@ -1,6 +1,6 @@ Name: pinentry Version: 1.1.1 -Release: 1 +Release: 2 Summary: A new module that contains various interfaces to enter a PIN/passphrase. License: GPLv2+ @@ -11,6 +11,8 @@ Source0: https://www.gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar Source1: pinentry-wrapper Source2: https://www.gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig +Patch1: Update-also-generated-configure-to-disable-rpath.patch + BuildRequires: pkgconfig(Qt5Widgets) libcap-devel ncurses-devel libassuan-devel BuildRequires: libgpg-error-devel libsecret-devel pkgconfig(Qt5Core) gcc BuildRequires: pkgconfig(Qt5Gui) gcr-devel gtk2-devel @@ -90,6 +92,9 @@ fi %doc ChangeLog NEWS TODO %changelog +* Mon Mar 7 2022 zoulin - 1.1.1-2 +- remove rpath + * Wed Dec 1 2021 zoulin - 1.1.1-1 - update version to 1.1.1 -- Gitee