PR#120: Use _changelog_trimage instead of _changelog_trimtimeUpdate macros - rpms/redhat-rpm-config

rpms / redhat-rpm-config

#120 Use _changelog_trimage instead of _changelog_trimtimeUpdate macros

Merged 3 years ago by zbyszek. Opened 3 years ago by marmarek.

rpms/ marmarek/redhat-rpm-config changelog-trim2 into rawhide

Use _changelog_trimage instead of _changelog_trimtimeUpdate macros

Marek Marczykowski-Górecki • 3 years ago

3d7758a

macros

file modified

+1 -1

		`@@ -358,7 +358,7 @@`
		`%__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:2365246060}`

		`#==============================================================================`
		`# ---- Generic auto req/prov filtering macros`

marmarek commented 3 years ago

_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

zuul commented 3 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

check-for-arches : SUCCESS in 1m 07s
rpm-scratch-build : SUCCESS in 8m 11s
rpm-scratch-build-s390x : SKIPPED (non-voting)
rpm-scratch-build-ppc64le : SKIPPED (non-voting)
rpm-scratch-build-i686 : SKIPPED (non-voting)
rpm-scratch-build-armv7hl : SKIPPED (non-voting)
rpm-scratch-build-aarch64 : SKIPPED (non-voting)
rpm-linter : FAILURE in 3m 04s
rpm-rpminspect : SUCCESS in 4m 26s (non-voting)
check-for-tests : SUCCESS in 34s
rpm-install-test : SKIPPED
rpm-test : FAILURE in 4m 08s

marmarek commented 3 years ago

FWIW the test failures don't look to be related to the change introduced here and are also present in the base branch.

pmatilai commented 3 years ago

Changing to trimage is good, but please keep the math. Don't need Lua for that either:

%_changelog_trimage %{expr:2*365*24*60*60}

tibbs commented 3 years ago

For those who *like me) might not have noticed it before (perhaps because the docs on rpm.org are somewhat out of date), `%{expr:...} was added in RPM 4.15.

rebased onto f76a55660e60e68c3aa76b4db962b512785f76e4

3 years ago

marmarek commented 3 years ago

I've updated it to use %{expr:...} syntax.

zuul commented 3 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci