diff --git a/backport-libassuan-2.5.2-multilib.patch b/backport-libassuan-2.5.2-multilib.patch new file mode 100644 index 0000000..8c3345c --- /dev/null +++ b/backport-libassuan-2.5.2-multilib.patch @@ -0,0 +1,28 @@ +diff -up libassuan-2.5.2/src/libassuan-config.in.multilib libassuan-2.5.2/src/libassuan-config.in +--- libassuan-2.5.2/src/libassuan-config.in.multilib 2019-01-08 16:31:11.042204893 +0100 ++++ libassuan-2.5.2/src/libassuan-config.in 2019-01-08 16:31:20.026048884 +0100 +@@ -19,7 +19,7 @@ lib="@LIBASSUAN_CONFIG_LIBS@" + extralibs="$gpg_error_libs" + cflags="@LIBASSUAN_CONFIG_CFLAGS@ $gpg_error_cflags" + api_version="@LIBASSUAN_CONFIG_API_VERSION@" +-my_host="@LIBASSUAN_CONFIG_HOST@" ++my_host="myhost" + prefix=@prefix@ + exec_prefix=@exec_prefix@ + includes="" +@@ -131,13 +131,7 @@ if test "$echo_cflags" = "yes"; then + fi + + if test "$echo_libs" = "yes"; then +- if test "@libdir@" != "/usr/lib" ; then +- libdirs="-L@libdir@" +- for i in $lib $extralibs ; do +- if test "$i" = "-L@libdir@" ; then +- libdirs="" +- fi +- done +- fi ++ # libdir is always standard and implicitly searched ++ libdirs="" + echo $libdirs $lib $extralibs + fi diff --git a/libassuan-2.5.4.tar.bz2 b/libassuan-2.5.4.tar.bz2 deleted file mode 100644 index 432d0e9..0000000 Binary files a/libassuan-2.5.4.tar.bz2 and /dev/null differ diff --git a/libassuan-2.5.4.tar.bz2.sig b/libassuan-2.5.4.tar.bz2.sig deleted file mode 100644 index 2bfc337..0000000 Binary files a/libassuan-2.5.4.tar.bz2.sig and /dev/null differ diff --git a/libassuan-2.5.5.tar.bz2 b/libassuan-2.5.5.tar.bz2 new file mode 100644 index 0000000..b95c7f3 Binary files /dev/null and b/libassuan-2.5.5.tar.bz2 differ diff --git a/libassuan-2.5.5.tar.bz2.sig b/libassuan-2.5.5.tar.bz2.sig new file mode 100644 index 0000000..f6cefb9 Binary files /dev/null and b/libassuan-2.5.5.tar.bz2.sig differ diff --git a/libassuan.spec b/libassuan.spec index 57be9c5..88b422d 100644 --- a/libassuan.spec +++ b/libassuan.spec @@ -1,5 +1,5 @@ Name: libassuan -Version: 2.5.4 +Version: 2.5.5 Release: 1 Summary: A small library implementing the so-called Assuan protocal License: LGPLv2+ and GPLv3+ @@ -7,7 +7,7 @@ URL: https://www.gnupg.org/ Source0: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2 Source1: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig -Patch0000: libassuan-2.5.2-multilib.patch +Patch0: backport-libassuan-2.5.2-multilib.patch BuildRequires: gcc gawk libgpg-error-devel >= 1.8 @@ -66,6 +66,12 @@ make check %doc ChangeLog NEWS README THANKS TODO %changelog +* Sat Mar 19 2022 xihaochen - 2.5.5-1 +- Type:requirements +- ID:NA +- SUG:NA +- DESC: update libassuan to 2.5.5 + * Tue Jan 26 2021 xihaochen - 2.5.4-1 - Type:requirements - ID:NA