gnupg2: add correct version of libgpg-error-devel as BR (#5128)

* gnupg2: add correct version of libgpg-error-devel as BR
* gnupg2: manifests: bump release

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>

SPECS/gnupg2/gnupg2.spec

@@ -1,7 +1,7 @@
 Summary:        OpenPGP standard implementation used for encrypted communication and data storage.
 Name:           gnupg2
 Version:        2.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD and CC0 and GPLv2+ and LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -15,7 +15,7 @@ BuildRequires:  npth-devel >= 1.2
 BuildRequires:  libassuan-devel >= 2.5.0
 BuildRequires:  libksba-devel >= 1.3.4
 BuildRequires:  libgcrypt-devel > 1.9.1
-BuildRequires:  libgpg-error-devel >= 1.41
+BuildRequires:  libgpg-error-devel >= 1.46
 Requires:       libksba > 1.3.4
 Requires:       libgcrypt >= 1.9.1
 Requires:       libgpg-error >= 1.46
@@ -89,6 +89,9 @@ ln -s $(pwd)/bin/gpg $(pwd)/bin/gpg2
 %defattr(-,root,root)
 
 %changelog
+* Tue Mar 21 2023 Muhammad Falak <mwani@microsoft.com> - 2.4.0-2
+- Add correct version for libgpg-error-devel as a BR
+
 * Mon Jan 23 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 2.4.0-1
 - Auto-upgrade to 2.4.0 - to fix CVE-2022-3515
 - Update libgpg-error dependency to 1.46

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -218,8 +218,8 @@ libksba-1.6.3-1.cm2.aarch64.rpm
 libksba-devel-1.6.3-1.cm2.aarch64.rpm
 npth-1.6-4.cm2.aarch64.rpm
 pinentry-1.2.0-1.cm2.aarch64.rpm
-gnupg2-2.4.0-1.cm2.aarch64.rpm
-gnupg2-lang-2.4.0-1.cm2.aarch64.rpm
+gnupg2-2.4.0-2.cm2.aarch64.rpm
+gnupg2-lang-2.4.0-2.cm2.aarch64.rpm
 gpgme-1.16.0-1.cm2.aarch64.rpm
 mariner-repos-shared-2.0-8.cm2.noarch.rpm
 mariner-repos-2.0-8.cm2.noarch.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -218,8 +218,8 @@ libksba-1.6.3-1.cm2.x86_64.rpm
 libksba-devel-1.6.3-1.cm2.x86_64.rpm
 npth-1.6-4.cm2.x86_64.rpm
 pinentry-1.2.0-1.cm2.x86_64.rpm
-gnupg2-2.4.0-1.cm2.x86_64.rpm
-gnupg2-lang-2.4.0-1.cm2.x86_64.rpm
+gnupg2-2.4.0-2.cm2.x86_64.rpm
+gnupg2-lang-2.4.0-2.cm2.x86_64.rpm
 gpgme-1.16.0-1.cm2.x86_64.rpm
 mariner-repos-shared-2.0-8.cm2.noarch.rpm
 mariner-repos-2.0-8.cm2.noarch.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -117,9 +117,9 @@ glibc-tools-2.35-3.cm2.aarch64.rpm
 gmp-6.2.1-2.cm2.aarch64.rpm
 gmp-debuginfo-6.2.1-2.cm2.aarch64.rpm
 gmp-devel-6.2.1-2.cm2.aarch64.rpm
-gnupg2-2.4.0-1.cm2.aarch64.rpm
-gnupg2-debuginfo-2.4.0-1.cm2.aarch64.rpm
-gnupg2-lang-2.4.0-1.cm2.aarch64.rpm
+gnupg2-2.4.0-2.cm2.aarch64.rpm
+gnupg2-debuginfo-2.4.0-2.cm2.aarch64.rpm
+gnupg2-lang-2.4.0-2.cm2.aarch64.rpm
 gperf-3.1-4.cm2.aarch64.rpm
 gperf-debuginfo-3.1-4.cm2.aarch64.rpm
 gpgme-1.16.0-1.cm2.aarch64.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -117,9 +117,9 @@ glibc-tools-2.35-3.cm2.x86_64.rpm
 gmp-6.2.1-2.cm2.x86_64.rpm
 gmp-debuginfo-6.2.1-2.cm2.x86_64.rpm
 gmp-devel-6.2.1-2.cm2.x86_64.rpm
-gnupg2-2.4.0-1.cm2.x86_64.rpm
-gnupg2-debuginfo-2.4.0-1.cm2.x86_64.rpm
-gnupg2-lang-2.4.0-1.cm2.x86_64.rpm
+gnupg2-2.4.0-2.cm2.x86_64.rpm
+gnupg2-debuginfo-2.4.0-2.cm2.x86_64.rpm
+gnupg2-lang-2.4.0-2.cm2.x86_64.rpm
 gperf-3.1-4.cm2.x86_64.rpm
 gperf-debuginfo-3.1-4.cm2.x86_64.rpm
 gpgme-1.16.0-1.cm2.x86_64.rpm