From ee704fdf3d76db5768a89fa56f385f943edfd26c Mon Sep 17 00:00:00 2001 From: Jakub Jelen <jjelen@redhat.com> Date: Tue, 2 May 2023 14:59:40 +0200 Subject: [PATCH] Remove unused patch and fix signature file checksum (#2193503) --- ...ests-gpgme-for-in-source-tree-builds.patch | 62 ------------------- gnupg2.spec | 2 +- sources | 2 +- 3 files changed, 2 insertions(+), 64 deletions(-) delete mode 100644 gnupg-2.4.0-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch diff --git a/gnupg-2.4.0-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch b/gnupg-2.4.0-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch deleted file mode 100644 index 71daadf..0000000 --- a/gnupg-2.4.0-tests-Fix-tests-gpgme-for-in-source-tree-builds.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0486caf56f96a279c7fe381b2a49ec674d6e60e2 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka <gniibe@fsij.org> -Date: Wed, 21 Dec 2022 10:52:24 +0900 -Subject: tests: Fix tests/gpgme for in-source-tree builds. - -* tests/gpgme/Makefile.am: Don't use setup.scm/ dir. -* tests/gpgme/all-tests.scm: Fix the name of the environment. - --- - -GnuPG-bug-id: 6313 -Fixes-commit: c19ea75f10d6278569619f90977ce7c820e9319d -Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> ---- - tests/gpgme/Makefile.in | 5 ++--- - tests/gpgme/all-tests.scm | 4 ++-- - 2 files changed, 4 insertions(+), 5 deletions(-) - -diff --git a/tests/gpgme/Makefile.in b/tests/gpgme/Makefile.in ---- a/tests/gpgme/Makefile.in 2022-12-16 11:49:34.000000000 -0500 -+++ b/tests/gpgme/Makefile.in 2022-12-20 23:35:26.757302512 -0500 -@@ -614,8 +614,7 @@ check: xcheck - - .PHONY: xcheck - xcheck: -- @$(MKDIR_P) setup.scm/tests \ -- tests/gpg lang/qt/tests lang/python/tests -+ @$(MKDIR_P) tests/gpg lang/qt/tests lang/python/tests - $(TESTS_ENVIRONMENT) $(abs_top_builddir)/tests/gpgscm/gpgscm$(EXEEXT) \ - $(abs_srcdir)/run-tests.scm $(TESTFLAGS) $(TESTS) - -@@ -624,7 +623,7 @@ xcheck: - all-local: $(required_pgms) - - clean-local: -- -rm -rf setup.scm/tests tests/gpg lang/qt/tests lang/python/tests -+ -rm -rf tests lang - - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. -diff --git a/tests/gpgme/all-tests.scm b/tests/gpgme/all-tests.scm -index 1746c4ee1..aef7d6a21 100644 ---- a/tests/gpgme/all-tests.scm -+++ b/tests/gpgme/all-tests.scm -@@ -41,7 +41,7 @@ - (test::scm - #f - #f -- (path-join "tests" "gpgme" "setup.scm" "tests" "gpg") -+ (path-join "tests" "gpgme" "tests" "gpg") - (in-srcdir "tests" "gpgme" "setup.scm") - "--" "tests" "gpg"))) - (define setup-py -@@ -49,7 +49,7 @@ - (test::scm - #f - #f -- (path-join "tests" "gpgme" "setup.scm" "lang" "python" "tests") -+ (path-join "tests" "gpgme" "lang" "python" "tests") - (in-srcdir "tests" "gpgme" "setup.scm") - "--" "lang" "python" "tests"))) - diff --git a/gnupg2.spec b/gnupg2.spec index 7b86f70..05e1b5d 100644 --- a/gnupg2.spec +++ b/gnupg2.spec @@ -213,7 +213,7 @@ make -k check %changelog * Fri Apr 28 2023 Todd Zullinger <tmz@pobox.com> - 2.4.1-1 -- update to 2.4.1 +- update to 2.4.1 (#2193503) * Fri Apr 28 2023 Todd Zullinger <tmz@pobox.com> - 2.4.0-4 - remove %%skip_verify, brainpool signatures are supported now diff --git a/sources b/sources index 323c27b..d0b7643 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (gnupg-2.4.1.tar.bz2) = 4d6b30ec4b8d786508ec1ac5f3c5b0ddebdc4f60aa72eb5d6ecc185ff0e9f1f4798f80ae16a3d136052b91ec54978ec0b7969a11a6c2727f30b3b6efabbaf388 -SHA512 (gnupg-2.4.1.tar.bz2.sig) = 0923b34da162c26f56d586eae748f8a9a58088006f2db384251bf81dac7bbb23a9923ca8b275bffb4c504c3a342e300abeaa83e9f29105af90ee7915ad92901e +SHA512 (gnupg-2.4.1.tar.bz2.sig) = 2fead4f71876bf839cffc78def542b2cfd1b76ac207a06d8725dca7e20572969d9d72fc28b0c84345ee56cc57f5e3ff83e79be24eab1ee6db91680ae95447809