rpms/skopeo
7
0
Fork 0
Code Issues Pull Requests Releases Activity

formatting changes

Browse Source 
include correct skopeo-containers dep for centos

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2018-04-07 22:51:52 -04:00
parent 18ee120de4
commit 8598b5f742
1 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
skopeo.spec
View File

@ -18,55 +18,59 @@
%global debug_package %{nil} %global debug_package %{nil}
#%%endif #%%endif
%global provider github %global provider github
%global provider_tld com %global provider_tld com
%global project projectatomic %global project projectatomic
%global repo skopeo %global repo skopeo
# https://github.com/projectatomic/skopeo # https://github.com/projectatomic/skopeo
%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
%global import_path %{provider_prefix} %global import_path %{provider_prefix}
%global git0 https://%{import_path} %global git0 https://%{import_path}
%global commit0 7add6fc80b0f33406217e7c3361cb711c814f028 %global commit0 7add6fc80b0f33406217e7c3361cb711c814f028
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required
# manually listed arches due https://bugzilla.redhat.com/show_bug.cgi?id=1391932 (removed ppc64) # manually listed arches due https://bugzilla.redhat.com/show_bug.cgi?id=1391932 (removed ppc64)
ExcludeArch: ppc64 ExcludeArch: ppc64
Name: %{repo} Name: %{repo}
%if 0%{?centos} %if 0%{?centos}
Epoch: 1 Epoch: 1
%endif # centos %endif # centos
Version: 0.1.29 Version: 0.1.29
Release: 5.git%{shortcommit0}%{?dist} Release: 5.git%{shortcommit0}%{?dist}
Summary: Inspect Docker images and repositories on registries Summary: Inspect Docker images and repositories on registries
License: ASL 2.0 License: ASL 2.0
URL: %{git0} URL: %{git0}
Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Source0: %{git0}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz
Source1: storage.conf Source1: storage.conf
Source2: containers-storage.conf.5.md Source2: containers-storage.conf.5.md
Source3: mounts.conf Source3: mounts.conf
Source4: registries.conf.5.md Source4: registries.conf.5.md
Source5: registries.conf Source5: registries.conf
Source6: policy.json.5.md Source6: policy.json.5.md
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: go-srpm-macros BuildRequires: go-srpm-macros
BuildRequires: compiler(go-compiler) BuildRequires: compiler(go-compiler)
%endif %endif
BuildRequires: git BuildRequires: git
# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. # 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} BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang}
BuildRequires: golang-github-cpuguy83-go-md2man BuildRequires: golang-github-cpuguy83-go-md2man
BuildRequires: gpgme-devel BuildRequires: gpgme-devel
BuildRequires: libassuan-devel BuildRequires: libassuan-devel
# Dependencies for containers/storage # Dependencies for containers/storage
BuildRequires: btrfs-progs-devel BuildRequires: btrfs-progs-devel
BuildRequires: pkgconfig(devmapper) BuildRequires: pkgconfig(devmapper)
BuildRequires: ostree-devel BuildRequires: ostree-devel
BuildRequires: glib2-devel BuildRequires: glib2-devel
%if 0%{?centos}
Requires: %{repo}-containers = %{epoch}:%{version}-%{release}
%else
Requires: %{repo}-containers = %{version}-%{release} Requires: %{repo}-containers = %{version}-%{release}
%endif # centos
%description %description
Command line utility to inspect images and repositories directly on Docker Command line utility to inspect images and repositories directly on Docker
@ -74,8 +78,8 @@ registries without the need to pull them
%if 0%{?with_devel} %if 0%{?with_devel}
%package devel %package devel
Summary: %{summary} Summary: %{summary}
BuildArch: noarch BuildArch: noarch
%if 0%{?with_check} && ! 0%{?with_bundled} %if 0%{?with_check} && ! 0%{?with_bundled}
BuildRequires: golang(github.com/Azure/go-ansiterm/winterm) BuildRequires: golang(github.com/Azure/go-ansiterm/winterm)
@ -163,14 +167,14 @@ building other packages which use import path with
%if 0%{?with_unit_test} && 0%{?with_devel} %if 0%{?with_unit_test} && 0%{?with_devel}
%package unit-test-devel %package unit-test-devel
Summary: Unit tests for %{name} package Summary: Unit tests for %{name} package
%if 0%{?with_check} %if 0%{?with_check}
#Here comes all BuildRequires: PACKAGE the unit tests #Here comes all BuildRequires: PACKAGE the unit tests
#in %%check section need for running #in %%check section need for running
%endif %endif
# test subpackage tests code from devel subpackage # test subpackage tests code from devel subpackage
Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release}
conflicts: atomic-registries <= 1.22.1-1 conflicts: atomic-registries <= 1.22.1-1
%description unit-test-devel %description unit-test-devel