packaging changes
- enable debuginfo - rename skopeo-containers to containers-common Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
parent
9d592799b8
commit
27ca06affe
36
skopeo.spec
36
skopeo.spec
@ -1,22 +1,15 @@
|
|||||||
%if 0%{?fedora} || 0%{?rhel} == 6
|
|
||||||
%global with_devel 0
|
%global with_devel 0
|
||||||
%global with_bundled 1
|
%global with_bundled 1
|
||||||
%global with_debug 1
|
%global with_debug 1
|
||||||
%global with_check 0
|
|
||||||
%global with_unit_test 0
|
%global with_unit_test 0
|
||||||
%else
|
|
||||||
%global with_devel 0
|
|
||||||
%global with_bundled 1
|
|
||||||
%global with_debug 1
|
|
||||||
%global with_check 0
|
%global with_check 0
|
||||||
%global with_unit_test 0
|
|
||||||
%endif
|
|
||||||
|
|
||||||
#%%if 0%%{?with_debug}
|
%if 0%{?with_debug}
|
||||||
#%%global _dwz_low_mem_die_limit 0
|
%global _find_debuginfo_dwz_opts %{nil}
|
||||||
#%%else
|
%global _dwz_low_mem_die_limit 0
|
||||||
|
%else
|
||||||
%global debug_package %{nil}
|
%global debug_package %{nil}
|
||||||
#%%endif
|
%endif
|
||||||
|
|
||||||
%global provider github
|
%global provider github
|
||||||
%global provider_tld com
|
%global provider_tld com
|
||||||
@ -68,9 +61,9 @@ BuildRequires: glib2-devel
|
|||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
|
||||||
%if 0%{?centos}
|
%if 0%{?centos}
|
||||||
Requires: %{repo}-containers = %{epoch}:%{version}-%{release}
|
Requires: containers-common = %{epoch}:%{version}-%{release}
|
||||||
%else
|
%else
|
||||||
Requires: %{repo}-containers = %{version}-%{release}
|
Requires: containers-common = %{version}-%{release}
|
||||||
%endif # centos
|
%endif # centos
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -185,12 +178,17 @@ This package contains unit tests for project
|
|||||||
providing packages with %{import_path} prefix.
|
providing packages with %{import_path} prefix.
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%package containers
|
%package -n containers-common
|
||||||
Summary: Configuration files for working with image signatures
|
Summary: Configuration files for working with image signatures
|
||||||
obsoletes: atomic <= 1.13.1-2
|
Obsoletes: atomic <= 1.13.1-2
|
||||||
obsoletes: docker-rhsubscription <= 2:1.13.1-31
|
Obsoletes: docker-rhsubscription <= 2:1.13.1-31
|
||||||
|
%if 0%{?centos}
|
||||||
|
Provides: %{name}-containers = %{epoch}:%{version}-%{release}
|
||||||
|
%else
|
||||||
|
Provides: %{name}-containers = %{version}-%{release}
|
||||||
|
%endif # centos
|
||||||
|
|
||||||
%description containers
|
%description -n containers-common
|
||||||
This package installs a default signature store configuration and a default
|
This package installs a default signature store configuration and a default
|
||||||
policy under `/etc/containers/`.
|
policy under `/etc/containers/`.
|
||||||
|
|
||||||
@ -294,7 +292,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
|
|||||||
%doc README.md
|
%doc README.md
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%files containers
|
%files -n containers-common
|
||||||
%dir %{_sysconfdir}/containers
|
%dir %{_sysconfdir}/containers
|
||||||
%dir %{_sysconfdir}/containers/registries.d
|
%dir %{_sysconfdir}/containers/registries.d
|
||||||
%config(noreplace) %{_sysconfdir}/containers/policy.json
|
%config(noreplace) %{_sysconfdir}/containers/policy.json
|
||||||
|
Loading…
Reference in New Issue
Block a user