rpms/samba
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Use baserelease rather than main_release macro

Browse Source 
baserelease is what we have standardized across Fedora and what
rpmdev-bumpspec knows how to handle.
This commit is contained in:
Pete Walter 2021-05-20 10:17:02 +01:00
parent 249389209b
commit eb93f258dc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
samba.spec
View File

@ -108,7 +108,7 @@
%define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") %define samba_requires_eq() %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
%global main_release 2 %global baserelease 2
%global samba_version 4.14.4 %global samba_version 4.14.4
%global talloc_version 2.3.2 %global talloc_version 2.3.2
@ -118,9 +118,9 @@
# This should be rc1 or nil # This should be rc1 or nil
%global pre_release %nil %global pre_release %nil
%global samba_release %{main_release} %global samba_release %{baserelease}
%if "x%{?pre_release}" != "x" %if "x%{?pre_release}" != "x"
%global samba_release 0.%{main_release}.%{pre_release} %global samba_release 0.%{baserelease}.%{pre_release}
%endif %endif
# This is a network daemon, do a hardened build # This is a network daemon, do a hardened build