#4 Fix FTBFS
Merged 2 years ago by kevin. Opened 2 years ago by gotmax23.
rpms/ gotmax23/reg rawhide  into  rawhide

Fix FTBFS
Maxwell G • 2 years ago  
file modified
+21 -31
@@ -1,7 +1,12 @@ 

  # Generated by go2rpm 1.5.0

  %bcond_without check

  

- %if 0%{?epel}

+ # Results in:

+ # ERROR: Source RPM is not installable:

+ # error: Missing rpmlib features for reg-0.16.1-7.el7.x86_64:

+ # error:  rpmlib(DynamicBuildRequires) <= 4.15.0-1

+ # when `0%%{?epel}` is used.

+ %if 0%{?rhel}

  %bcond_without bundled

  %endif

  
@@ -47,7 +52,7 @@ 

  %global godocs          VERSION.txt README.md

  

  Name:       reg

- Release:    7%{?dist}

+ Release:    8%{?dist}

  Summary:    Docker registry v2 command line client

  

  License:    MIT
@@ -74,35 +79,6 @@ 

  BuildRequires: systemd-rpm-macros

  %endif

  

- %if %{without bundled}

- BuildRequires:  golang(github.com/coreos/clair/api/v3/clairpb)

- BuildRequires:  golang(github.com/docker/cli/cli/config)

- BuildRequires:  golang(github.com/docker/cli/cli/config/types)

- BuildRequires:  golang(github.com/docker/distribution)

- BuildRequires:  golang(github.com/docker/distribution/manifest/manifestlist)

- BuildRequires:  golang(github.com/docker/distribution/manifest/schema1)

- BuildRequires:  golang(github.com/docker/distribution/manifest/schema2)

- BuildRequires:  golang(github.com/docker/distribution/reference)

- BuildRequires:  golang(github.com/docker/docker/api/types)

- BuildRequires:  golang(github.com/docker/docker/api/types/container)

- BuildRequires:  golang(github.com/docker/docker/client)

- BuildRequires:  golang(github.com/docker/docker/pkg/jsonmessage)

- BuildRequires:  golang(github.com/docker/docker/pkg/term)

- BuildRequires:  golang(github.com/genuinetools/pkg/cli)

- BuildRequires:  golang(github.com/gorilla/mux)

- BuildRequires:  golang(github.com/mitchellh/go-wordwrap)

- BuildRequires:  golang(github.com/opencontainers/go-digest)

- BuildRequires:  golang(github.com/peterhellberg/link)

- BuildRequires:  golang(github.com/shurcooL/httpfs/html/vfstemplate)

- BuildRequires:  golang(github.com/sirupsen/logrus)

- BuildRequires:  golang(google.golang.org/grpc)

- 

- %if %{with check}

- # Tests

- BuildRequires:  golang(github.com/google/go-cmp/cmp)

- %endif

- %endif

- 

  Obsoletes: reg-server < %{version}

  

  %description
@@ -114,6 +90,17 @@ 

  %endif

  %goprep %{?with_bundled:-k}

  %patch0 -p1

+ %if %{without bundled}

+ # Use new docker/distribution import path

+ sed \

+     -e 's|github.com/docker/distribution|github.com/distribution/distribution/v3|' \

+     -i $(find . -name '*.go')

+ %endif

+ 

+ %if %{without bundled}

+ %generate_buildrequires

+ %go_generate_buildrequires

+ %endif

  

  %build

  # When vendoring, use Go modules
@@ -163,6 +150,9 @@ 

  %config(noreplace) %{_sharedstatedir}/%{name}-server/templates/

  

  %changelog

+ * Mon Jul 04 2022 Maxwell G <gotmax@e.email> - 0.16.1-8

+ - Fix FTBFS

+ 

  * Sat Jun 18 2022 Robert-André Mauchin <zebob.m@gmail.com> - 0.16.1-7

  - Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,

    CVE-2022-29526, CVE-2022-30629

I saw your message on infrastructure@ and looked into this. Also, please remember to give @go-sig privileges on this package. You can go directly to https://src.fedoraproject.org/rpms/reg/addgroup if you don't feel like clicking through the UI.

Thanks! go-sig added.

Pull-Request has been merged by kevin

2 years ago
Metadata