particle-os/debian-forge-composer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

spec: add epoch to nevra only if it's set

Browse source 
This change was tested by running:
```
$ rpm --eval '
    %global noepoch 42
    %{?epoch:%epoch:}
  '
$ rpm --eval '
    %global epoch 42
    %{?epoch:%epoch:}
  '
42:
```

Fixes #2054

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
This commit is contained in:
Ondřej Budai 2021-11-24 09:01:48 +01:00 • committed by Tom Gundersen
parent b0ef1ac256
commit d61e1c009b
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
osbuild-composer.spec
View file

@ -130,7 +130,7 @@ export GOFLAGS=-mod=vendor
%if %{?commit:1}0
export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.GitRev=%{commit}'"
%endif
export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{epoch}:%{version}-%{release}.%{_arch}'"
export LDFLAGS="${LDFLAGS} -X 'github.com/osbuild/osbuild-composer/internal/common.RpmVersion=%{name}-%{?epoch:%epoch:}%{version}-%{release}.%{_arch}'"
%gobuild -o _bin/osbuild-composer %{goipath}/cmd/osbuild-composer
%gobuild -o _bin/osbuild-worker %{goipath}/cmd/osbuild-worker