!12 update to 1.2.1

From: @yunjia_w 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2023-07-28 01:20:54 +00:00 committed by Gitee
commit 2f5d9165d0
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 6 additions and 32 deletions

View File

@ -1,27 +0,0 @@
From 8031753da4bed81fd133dceff8187f0e86e02f3f Mon Sep 17 00:00:00 2001
From: Jakub Jelen <jjelen@redhat.com>
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

Binary file not shown.

Binary file not shown.

BIN
pinentry-1.2.1.tar.bz2 Normal file

Binary file not shown.

BIN
pinentry-1.2.1.tar.bz2.sig Normal file

Binary file not shown.

View File

@ -1,18 +1,16 @@
Name: pinentry
Version: 1.1.1
Release: 3
Version: 1.2.1
Release: 1
Summary: A new module that contains various interfaces to enter a PIN/passphrase.
License: GPLv2+
URL: https://github.com/gpg/pinentry/archive/pinentry-1.1.0.tar.gz
URL: https://github.com/gpg/pinentry
Source0: https://www.gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2
# source1 is from opensuse
Source1: pinentry-wrapper
Source2: https://www.gnupg.org/ftp/gcrypt/pinentry/%{name}-%{version}.tar.bz2.sig
Patch0: 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
@ -92,6 +90,9 @@ fi
%doc ChangeLog NEWS TODO
%changelog
* Thu Jul 20 2023 wangyunjia <yunjia.wang@huawei.com> - 1.2.1-1
- update version to 1.2.1
* Sat Oct 22 2022 zhangruifang <zhangruifang1@h-partners.com> - 1.1.1-3
- add version number for Obsoletes