commit 89c1b089ceaa5841b06b866fb8ab6e01e2b8dd06 Author: Jakub Bogusz <qbo...@pld-linux.org> Date: Sun Jun 23 19:47:43 2024 +0200
- updated to 1.11.0 libgcrypt-libgcrypt_config.patch | 22 +++------------------- libgcrypt.spec | 13 ++++++------- 2 files changed, 9 insertions(+), 26 deletions(-) --- diff --git a/libgcrypt.spec b/libgcrypt.spec index 82b7d26..71d99f0 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -9,25 +9,25 @@ Summary(es.UTF-8): Libgcrypt es una biblioteca general de desarrole embasada em Summary(pl.UTF-8): Biblioteka kryptograficzna oparta na kodzie GnuPG Summary(pt_BR.UTF-8): libgcrypt é uma biblioteca de criptografia de uso geral baseada no GnuPG Name: libgcrypt -Version: 1.10.3 +Version: 1.11.0 Release: 1 License: LGPL v2.1+ Group: Libraries Source0: ftp://ftp.gnupg.org/gcrypt/libgcrypt/%{name}-%{version}.tar.bz2 -# Source0-md5: a8cada0b343e10dbee51c9e92d856a94 +# Source0-md5: 321c4975cfd6a496f0530b65a673f9a4 Patch0: %{name}-info.patch Patch1: %{name}-libgcrypt_config.patch URL: https://directory.fsf.org/wiki/Libgcrypt -BuildRequires: autoconf >= 2.60 +BuildRequires: autoconf >= 2.69 BuildRequires: automake >= 1:1.14 BuildRequires: binutils >= 2:2.12 %{?with_dietlibc:BuildRequires: dietlibc-static >= 2:0.31-5} BuildRequires: gcc >= 5:3.2 %{?with_libcap:BuildRequires: libcap-devel} -BuildRequires: libgpg-error-devel >= 1.27 +BuildRequires: libgpg-error-devel >= 1.49 BuildRequires: libtool >= 2:2.2.6 BuildRequires: texinfo -Requires: libgpg-error >= 1.27 +Requires: libgpg-error >= 1.49 # getrandom() for getentropy() Requires: uname(release) >= 3.17 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -78,7 +78,7 @@ Summary(pt_BR.UTF-8): Arquivos de desenvolvimento da libgcrypt Group: Development/Libraries Requires: %{name} = %{version}-%{release} %{?with_libcap:Requires: libcap-devel} -Requires: libgpg-error-devel >= 1.25 +Requires: libgpg-error-devel >= 1.49 %description devel Header files etc to develop libgcrypt applications. @@ -195,7 +195,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/libgcrypt-config %attr(755,root,root) %{_libdir}/libgcrypt.so %{_libdir}/libgcrypt.la %{_includedir}/gcrypt*.h diff --git a/libgcrypt-libgcrypt_config.patch b/libgcrypt-libgcrypt_config.patch index 7a28f87..f38ef8b 100644 --- a/libgcrypt-libgcrypt_config.patch +++ b/libgcrypt-libgcrypt_config.patch @@ -1,15 +1,6 @@ ---- libgcrypt-1.10.1/src/libgcrypt-config.in.orig 2018-10-24 09:45:45.000000000 +0200 -+++ libgcrypt-1.10.1/src/libgcrypt-config.in 2023-01-19 11:34:29.348466297 +0100 -@@ -154,7 +154,7 @@ - - tmp="" - for i in $includes $cflags_final; do -- if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then -+ if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then - tmp="$tmp $i" - fi - done -@@ -165,17 +165,12 @@ +--- libgcrypt-1.11.0/src/libgcrypt-config.in.orig 2024-06-23 13:19:55.926444925 +0200 ++++ libgcrypt-1.11.0/src/libgcrypt-config.in 2024-06-23 17:10:04.991634797 +0200 +@@ -165,11 +165,6 @@ if test "$echo_libs" = "yes"; then libdirs="" libs_final="$libs" @@ -21,10 +12,3 @@ # Set up `libs_final'. libs_final="$libs_final $gpg_error_libs" - tmp="" - for i in $libdirs $libs_final; do -- if echo "$tmp" | fgrep -v -- "$i" >/dev/null; then -+ if echo "$tmp" | grep -F -v -- "$i" >/dev/null; then - tmp="$tmp $i" - fi - done ================================================================ ---- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/libgcrypt.git/commitdiff/89c1b089ceaa5841b06b866fb8ab6e01e2b8dd06 _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit