From d4f828d39156fe876c707649405d5aef8f5bd98e Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Jan 28 2021 15:19:10 +0000
Subject: containers-common-4:1-3


- Resolves: #1916922 - drop subscription-manager dep
- use config files from minimum common versions of upstream libraries
- list files in alphabetical order

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>

---

diff --git a/containers-common.spec b/containers-common.spec
index df269e5..088e524 100644
--- a/containers-common.spec
+++ b/containers-common.spec
@@ -6,7 +6,7 @@
 %global skopeo_branch v1.2.1
 %global podman_branch v3.0.0-rc1
 %global image_branch  v5.9.0
-%global common_branch v0.33.1
+%global common_branch v0.33.0
 %global storage_branch v1.24.5
 %global shortnames_branch main
 
@@ -15,33 +15,32 @@
 Epoch: 4
 Name: containers-common
 Version: 1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Common configuration and documentation for containers
 License: ASL 2.0
 BuildArch: noarch
 BuildRequires: go-md2man
 Recommends: fuse-overlayfs
 Recommends: slirp4netns
-Recommends: subscription-manager
-Source1: %{github_containers}/storage/%{storage_branch}/storage.conf
-Source2: %{github_containers}/storage/%{storage_branch}/docs/containers-storage.conf.5.md
-Source3: %{github_containers}/common/%{common_branch}/pkg/subscriptions/mounts.conf
-Source4: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.5.md
-Source5: %{github_containers}/image/%{image_branch}/registries.conf
-Source6: %{github_containers}/image/%{image_branch}/docs/containers-policy.json.5.md
-Source7: %{github_containers}/common/%{common_branch}/pkg/seccomp/seccomp.json
-Source8: %{github_containers}/podman/%{podman_branch}/docs/source/markdown/containers-mounts.conf.5.md
-Source9: %{github_containers}/image/%{image_branch}/docs/containers-signature.5.md
-Source10: %{github_containers}/image/%{image_branch}/docs/containers-transports.5.md
-Source11: %{github_containers}/image/%{image_branch}/docs/containers-certs.d.5.md
-Source12: %{github_containers}/image/%{image_branch}/docs/containers-registries.d.5.md
-Source13: %{github_containers}/common/%{common_branch}/pkg/config/containers.conf
-Source14: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md
-Source15: %{github_containers}/image/%{image_branch}/docs/containers-auth.json.5.md
-Source16: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.d.5.md
+Source1: %{github_containers}/common/%{common_branch}/docs/containers.conf.5.md
+Source2: %{github_containers}/common/%{common_branch}/pkg/config/containers.conf
+Source3: %{github_containers}/common/%{common_branch}/pkg/seccomp/seccomp.json
+Source4: %{github_containers}/common/%{common_branch}/pkg/subscriptions/mounts.conf
+Source5: %{github_containers}/image/%{image_branch}/docs/containers-auth.json.5.md
+Source6: %{github_containers}/image/%{image_branch}/docs/containers-certs.d.5.md
+Source7: %{github_containers}/image/%{image_branch}/docs/containers-policy.json.5.md
+Source8: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.5.md
+Source9: %{github_containers}/image/%{image_branch}/docs/containers-registries.conf.d.5.md
+Source10: %{github_containers}/image/%{image_branch}/docs/containers-registries.d.5.md
+Source11: %{github_containers}/image/%{image_branch}/docs/containers-signature.5.md
+Source12: %{github_containers}/image/%{image_branch}/docs/containers-transports.5.md
+Source13: %{github_containers}/image/%{image_branch}/registries.conf
+Source14: %{github_containers}/podman/%{podman_branch}/docs/source/markdown/containers-mounts.conf.5.md
+Source15: %{github_containers}/shortnames/%{shortnames_branch}/shortnames.conf
+Source16: %{github_containers}/skopeo/%{skopeo_branch}/default.yaml
 Source17: %{github_containers}/skopeo/%{skopeo_branch}/integration/fixtures/policy.json
-Source18: %{github_containers}/skopeo/%{skopeo_branch}/default.yaml
-Source19: %{github_containers}/shortnames/%{shortnames_branch}/shortnames.conf
+Source18: %{github_containers}/storage/%{storage_branch}/docs/containers-storage.conf.5.md
+Source19: %{github_containers}/storage/%{storage_branch}/storage.conf
 
 %description
 This package contains common configuration files and documentation for container
@@ -95,25 +94,31 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
 %files
 %dir %{_sysconfdir}/containers
 %dir %{_sysconfdir}/containers/certs.d
-%dir %{_sysconfdir}/containers/registries.d
 %dir %{_sysconfdir}/containers/oci
 %dir %{_sysconfdir}/containers/oci/hooks.d
+%dir %{_sysconfdir}/containers/registries.conf.d
+%dir %{_sysconfdir}/containers/registries.d
 %config(noreplace) %{_sysconfdir}/containers/policy.json
-%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
-%config(noreplace) %{_sysconfdir}/containers/storage.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/shortnames.conf
+%config(noreplace) %{_sysconfdir}/containers/registries.d/default.yaml
+%config(noreplace) %{_sysconfdir}/containers/storage.conf
 %ghost %{_sysconfdir}/containers/containers.conf
 %dir %{_sharedstatedir}/containers/sigstore
 %{_mandir}/man5/*
 %dir %{_datadir}/containers
+%{_datadir}/containers/containers.conf
 %{_datadir}/containers/mounts.conf
 %{_datadir}/containers/seccomp.json
-%{_datadir}/containers/containers.conf
 %dir %{_datadir}/rhel/secrets
 %{_datadir}/rhel/secrets/*
 
 %changelog
+* Thu Jan 28 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-3
+- Resolves: #1916922 - drop subscription-manager dep
+- use config files from minimum common versions of upstream libraries
+- list files in alphabetical order
+
 * Wed Jan 20 2021 Lokesh Mandvekar <lsm5@fedoraproject.org> - 4:1-2
 - bump version to random number
 - no connection of package to github.com/containers/common