Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libassuan.git#d28ff8d59681c08fc6a2f2b35bdcb72c5706ae27

.gitignore

@@ -8,3 +8,5 @@
 /libassuan-2.5.2.tar.bz2
 /libassuan-2.5.3.tar.bz2
 /libassuan-2.5.3.tar.bz2.sig
+/libassuan-2.5.4.tar.bz2
+/libassuan-2.5.4.tar.bz2.sig

libassuan-2.5.3-includedir.patch

@@ -1,11 +0,0 @@
-diff -up libassuan-2.5.3/src/libassuan.pc.in.includedir libassuan-2.5.3/src/libassuan.pc.in
---- libassuan-2.5.3/src/libassuan.pc.in.includedir	2018-10-25 11:20:28.000000000 +0200
-+++ libassuan-2.5.3/src/libassuan.pc.in	2019-08-19 10:29:10.536279378 +0200
-@@ -9,6 +9,6 @@ Name: libassuan
- Description: IPC library for the GnuPG components
- Requires: gpg-error
- Version: @PACKAGE_VERSION@
--Cflags: @LIBASSUAN_CONFIG_CFLAGS@
-+Cflags: @LIBASSUAN_CONFIG_CFLAGS@ -I${includedir}
- Libs: @LIBASSUAN_CONFIG_LIBS@
- URL: https://www.gnupg.org/related_software/libassuan/index.html

libassuan.spec

@@ -1,7 +1,7 @@
 Name:    libassuan
 Summary: GnuPG IPC library
-Version: 2.5.3
-Release: 4%{?dist}
+Version: 2.5.4
+Release: 1%{?dist}
 
 # The library is LGPLv2+, the documentation GPLv3+
 License: LGPLv2+ and GPLv3+
@@ -10,7 +10,6 @@ Source1: https://gnupg.org/ftp/gcrypt/libassuan/libassuan-%{version}.tar.bz2.sig
 URL:     http://www.gnupg.org/
 
 Patch1:  libassuan-2.5.2-multilib.patch
-Patch2:  libassuan-2.5.3-includedir.patch
 
 BuildRequires: gcc
 BuildRequires: gawk
@@ -37,7 +36,6 @@ This package contains files needed to develop applications using %{name}.
 %setup -q
 
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .includedir
 
 
 %build
@@ -76,6 +74,9 @@ make check
 
 
 %changelog
+* Tue Dec 01 2020 Jakub Jelen <jjelen@redhat.com> - 2.5.4-1
+- New upstream release (#1891067)
+
 * Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 

sources

@@ -1,2 +1,2 @@
-SHA512 (libassuan-2.5.3.tar.bz2) = e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
-SHA512 (libassuan-2.5.3.tar.bz2.sig) = b65c7ec86b231f49364f770f256ebfc0d757aad45d8ec512e34c8c7a9c5b1e9461ac7b53d45c77f9fa5a0afa3d487061a6007c2ab38a5eae93f5ca4ccf5c06ba
+SHA512 (libassuan-2.5.4.tar.bz2) = 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f
+SHA512 (libassuan-2.5.4.tar.bz2.sig) = 9f0c06af34ceca99a2511bfab2aa4669018546da3d64720f0938f590139a6a90f5e41ce3b2ef09ed4735430a292c24e1f66cab95d1b83877973a55dec44155c1