[packages/libgcrypt] replace fgrep with grep -F lin libgcrypt-config; rel 2

atler atler at pld-linux.org
Thu Jan 19 11:43:52 CET 2023


commit 8eb18f147abc4aaf0f204f4fe325d9213eaccf6d
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Jan 19 11:43:22 2023 +0100

    replace fgrep with grep -F lin libgcrypt-config; rel 2

 libgcrypt-libgcrypt_config.patch | 22 +++++++++++++++++++---
 libgcrypt.spec                   |  2 +-
 2 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/libgcrypt.spec b/libgcrypt.spec
index ac8c83d..74e426d 100644
--- a/libgcrypt.spec
+++ b/libgcrypt.spec
@@ -9,7 +9,7 @@ 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.1
-Release:	1
+Release:	2
 License:	LGPL v2.1+
 Group:		Libraries
 Source0:	ftp://ftp.gnupg.org/gcrypt/libgcrypt/%{name}-%{version}.tar.bz2
diff --git a/libgcrypt-libgcrypt_config.patch b/libgcrypt-libgcrypt_config.patch
index 09a6c0f..7a28f87 100644
--- a/libgcrypt-libgcrypt_config.patch
+++ b/libgcrypt-libgcrypt_config.patch
@@ -1,6 +1,15 @@
---- libgcrypt-1.2.4/src/libgcrypt-config.in.orig	2007-02-13 11:51:45.000000000 +0100
-+++ libgcrypt-1.2.4/src/libgcrypt-config.in	2007-02-13 11:52:11.000000000 +0100
-@@ -137,11 +137,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 @@
      libdirs=""
      libs_final="$libs"
  
@@ -12,3 +21,10 @@
      # 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/8eb18f147abc4aaf0f204f4fe325d9213eaccf6d



More information about the pld-cvs-commit mailing list