# This is a combination of 2 commits.

# This is the 1st commit message:

Address #491
add_changelog_entry(): Incorrect evr expansion

# This is the commit message #2:

Do not ignore user passed `evr`

Author: jessp01

specfile/specfile.py

@@ -611,11 +611,11 @@ def add_changelog_entry(
                 if self.contains_autochangelog(section):
                     continue
                 if evr is None:
-                    evr = "%{?epoch:%{epoch}:}%{version}-%{release}"
+                    epoch_prefix = f"{self.expanded_epoch}:" if self.expanded_epoch else ""
+                    evr = f"{epoch_prefix}{self.expanded_version}-{self.expanded_release}"
                 with self.changelog(section) as changelog:
                     if changelog is None:
                         return
-                    evr = self.expand(evr, extra_macros=[("dist", "")])
                     if isinstance(entry, str):
                         entry = [entry]
                     if timestamp is None: