clean autorelease merge conflict

This commit is contained in:
Sandino Araico Sánchez 2024-09-10 00:56:19 -06:00
parent c9f75a9e89
commit d7f397c0c4

View file

@ -1,15 +1,3 @@
<<<<<<< HEAD
=======
## START: Set by rpmautospec
## (rpmautospec version 0.7.1)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 3;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
>>>>>>> backports/fedora-39
# download path contains version without the last (fourth) digit
%global libo_version 24.8.0