[Bug 1970050] Review Request: cri-o - Kubernetes Container Runtime Interface for OCI-based containers

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



https://bugzilla.redhat.com/show_bug.cgi?id=1970050



--- Comment #9 from Peter Hunt <pehunt@xxxxxxxxxx> ---
some small tweaks, here's a diff with explanations inline
```
# duplicated with the declaration at the top needed for gometa
34a35,36
> # https://github.com/cri-o/cri-o
> %global goipath         github.com/cri-o/cri-o
# update url
44c45
< URL:            https://github.com/cri-o/cri-o
---
> URL:            https://github.com/rclone/rclone
# our obs instance doesn't provide go_compiler, but does provide golang. every
rhel (centos) needs to require golang
50,53d50
< %if 0%{?rhel}
< BuildRequires:  golang
< %endif
< 
56a54,55
> # If go_compiler is not set to 1, there is no virtual provide. Use golang instead.
> BuildRequires:  %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
# need to add go-rpm-macros in fedora
62d59
< BuildRequires:  go-rpm-macros
# import_path is no longer defined
125,129c122,126
< export LDFLAGS="-X
%{goipath}/internal/pkg/criocli.DefaultsPath=%{criocli_path}
< -X  %{goipath}/internal/version.buildDate=%{build_timestamp}
< -X  %{goipath}/internal/version.gitCommit=%{commit0}
< -X  %{goipath}/internal/version.version=%{version}
< -X  %{goipath}/internal/version.gitTreeState=%{git_tree_state} "
---
> export LDFLAGS="-X %{import_path}/internal/pkg/criocli.DefaultsPath=%{criocli_path}
> -X  %{import_path}/internal/version.buildDate=%{build_timestamp}
> -X  %{import_path}/internal/version.gitCommit=%{commit0}
> -X  %{import_path}/internal/version.version=%{version}
> -X  %{import_path}/internal/version.gitTreeState=%{git_tree_state}"
# only call set_build_flags on fedora where it's defined
135d131
< %if 0%{?fedora}
137d132
< %endif
# remove commented out fields
188a184,185
> #install -dp %%{buildroot}%%{_libexecdir}/%%{service_name}/%%{service_name}-wipe
> #install -dp %%{buildroot}%%{_prefix}/lib/systemd/system-preset

```


-- 
You are receiving this mail because:
You are on the CC list for the bug.
You are always notified about changes to this product and component
_______________________________________________
package-review mailing list -- package-review@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to package-review-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/package-review@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure




[Index of Archives]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Yosemite Conditions]     [KDE Users]

  Powered by Linux