packages/skopeo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove subpackage containers-common

Browse Source 
(cherry picked from commit 5d1a4a0ba1ed9db64443fde4636159d957063119)
This commit is contained in:
duyiwei 2023-06-09 09:47:07 +08:00 committed by openeuler-sync-bot
parent 354e858690
commit 61971f68be
2 changed files with 5 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
registries.conf
View File

@ -1,2 +0,0 @@
# # An array of host[:port] registries to try when pulling an unqualified image, in order.
unqualified-search-registries = ["docker.io"]

36
skopeo.spec
View File

@ -30,18 +30,17 @@ ExcludeArch: ppc64
Name: %{repo}
Epoch: 1
Version: 1.5.2
Release: 1
Release: 2
Summary: Work with remote images registries - retrieving information, images, signing content
License: ASL 2.0
URL: %{git0}
Source0: %{git0}/archive/%{build_version}.tar.gz
Source1: https://github.com/cpuguy83/go-md2man/archive/v1.0.10.tar.gz
Source2: registries.conf
BuildRequires: go-srpm-macros git-core pkgconfig(devmapper) make
BuildRequires: golang >= 1.16.6
BuildRequires: gpgme-devel libassuan-devel btrfs-progs-devel ostree-devel glib2-devel
Requires: containers-common = %{epoch}:%{version}-%{release}
Requires: containers-common
Provides: bundled(golang(github.com/beorn7/perks)) = 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
Provides: bundled(golang(github.com/BurntSushi/toml)) = master
Provides: bundled(golang(github.com/containerd/continuity)) = d8fb8589b0e8e85b8c8bbaa8840226d0dfeb7371
@ -212,18 +211,6 @@ This package contains unit tests for project
providing packages with %{import_path} prefix.
%endif
%package -n containers-common
Summary: Configuration files for working with image signatures
Obsoletes: atomic <= 1.13.1-2
Conflicts: atomic-registries <= 1.22.1-1
Obsoletes: docker-rhsubscription <= 2:1.13.1-31
Provides: %{name}-containers = %{version}-%{release}
Obsoletes: %{name}-containers <= %{version}-%{release}
%description -n containers-common
This package installs a default signature store configuration and a default
policy under `/etc/containers/`.
%prep
%autosetup -Sgit -n %{name}-%{version}
tar -xf %SOURCE1
@ -265,14 +252,6 @@ make \
install -m0755 -d -p %{buildroot}%{_bindir}
install -m0755 bin/skopeo %{buildroot}%{_bindir}/%{name}
install -m0755 -d -p %{buildroot}%{_sysconfdir}/containers
install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/containers/registries.conf
install -m0755 -d -p %{buildroot}/var/lib/containers/sigstore
install -m0755 -d -p %{buildroot}%{_sysconfdir}/containers/registries.d
install -m0644 default.yaml %{buildroot}%{_sysconfdir}/containers/registries.d/default.yaml
install -m0644 default-policy.json %{buildroot}%{_sysconfdir}/containers/policy.json
# source codes for building projects
%if 0%{?with_devel}
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
@ -329,14 +308,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%doc README.md
%endif
%files -n containers-common
%dir /etc/containers
%config(noreplace) /etc/containers/registries.conf
%dir /etc/containers/registries.d
%config(noreplace) /etc/containers/registries.d/default.yaml
%config(noreplace) /etc/containers/policy.json
%dir /var/lib/containers/sigstore
%files
%license LICENSE
%doc README.md
@ -347,6 +318,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%{_prefix}/share/bash-completion/completions/%{name}
%changelog
* Fri Jun 09 2023 duyiwei <duyiwei@kylinos.cn> - 1:1.5.2-2
- remove subpackage containers-common
* Mon Nov 29 2021 haozi007<liuhao27@huawei.com> - 1.1.0-7.dev.git63085f5
- Type:bugfix
- ID:NA