From 3d7758a2f04817a2bf2e4ebdb71fb3008825a6e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 25 Feb 2021 16:29:56 +0000 Subject: [PATCH] Use _changelog_trimage instead of _changelog_trimtimeUpdate macros _changelog_trimtime is deprecated in favor of _changelog_trimage. Furthermore, _changelog_trimage is relative to the newest entry instead of the build time - which helps with package reproducibility. Details: - https://github.com/rpm-software-management/rpm/commit/a587258 - https://bugzilla.redhat.com/1722806 --- macros | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros b/macros index b946438..b07e194 100644 --- a/macros +++ b/macros @@ -358,7 +358,7 @@ print(result) %__global_compiler_flags %{_general_options} %{_warning_options} %{_preprocessor_defines} %{_hardened_cflags} %{_annotation_cflags} %{_legacy_options} # Automatically trim changelog entries after 2 years -%_changelog_trimtime %{lua:print(os.time() - 2 * 365 * 86400)} +%_changelog_trimage %{expr:2*365*24*60*60} #============================================================================== # ---- Generic auto req/prov filtering macros