MSVSphere debranding

SOURCES/registries.conf

@@ -32,7 +32,7 @@
 # To ensure compatibility with docker we've included docker.io in the default search list. However Red Hat
 # does not curate, patch or maintain container images from the docker.io registry.
 [registries.search]
-registries = ['registry.access.redhat.com', 'registry.redhat.io', 'docker.io']
+registries = ['docker.io']
 
 # The following registries entry can be used for convenience but includes
 # container images built by the community. This set of content comes with all
@@ -61,7 +61,7 @@ registries = []
 # mirrors:
 #
 # # An array of host[:port] registries to try when pulling an unqualified image, in order.
-unqualified-search-registries = ["registry.fedoraproject.org", "registry.access.redhat.com", "registry.centos.org", "docker.io"]
+unqualified-search-registries = ["docker.io"]
 #
 # [[registry]]
 # # The "prefix" field is used to choose the relevant [[registry]] TOML table;

SOURCES/shortnames.conf

@@ -20,6 +20,8 @@
   # Fedora
   "fedora-minimal" = "registry.fedoraproject.org/fedora-minimal"
   "fedora" = "registry.fedoraproject.org/fedora"
+  # MSVSphere
+  "msvsphere" = "docker.io/inferit/msvsphere"
   # openSUSE
   "opensuse/tumbleweed" = "registry.opensuse.org/opensuse/tumbleweed"
   "opensuse/tumbleweed-dnf" = "registry.opensuse.org/opensuse/tumbleweed-dnf"

SPECS/skopeo.spec

@@ -28,7 +28,7 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 Epoch: 1
 Name: skopeo
 Version: 1.2.4
-Release: 2%{?dist}
+Release: 2%{?dist}.inferit
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -58,7 +58,6 @@ Source15: https://raw.githubusercontent.com/containers/image/%{image_branch}/doc
 Source16: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.d.5.md
 Source17: https://raw.githubusercontent.com/containers/shortnames/%{shortnames_branch}/shortnames.conf
 Source18: https://raw.githubusercontent.com/containers/image/%{image_branch}/docs/containers-registries.conf.5.md
-Source19: rhel-shortnames.conf
 BuildRequires: git
 BuildRequires: golang >= 1.12.12-4
 BuildRequires: go-md2man
@@ -141,7 +140,6 @@ install -dp %{buildroot}%{_sysconfdir}/containers/{certs.d,oci/hooks.d,registrie
 install -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/containers/storage.conf
 install -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/containers/registries.conf
 install -m0644 %{SOURCE17} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
-install -m0644 %{SOURCE19} %{buildroot}%{_sysconfdir}/containers/registries.conf.d/rhel-shortnames.conf
 install -dp %{buildroot}%{_mandir}/man5
 go-md2man -in %{SOURCE2} -out %{buildroot}%{_mandir}/man5/containers-storage.conf.5
 go-md2man -in %{SOURCE4} -out %{buildroot}%{_mandir}/man5/containers-registries.conf.5
@@ -207,7 +205,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %config(noreplace) %{_sysconfdir}/containers/storage.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.conf.d/000-shortnames.conf
-%config(noreplace) %{_sysconfdir}/containers/registries.conf.d/rhel-shortnames.conf
 %config(noreplace) %{_sysconfdir}/containers/registries.d/*.yaml
 %ghost %{_sysconfdir}/containers/containers.conf
 %dir %{_sharedstatedir}/containers/sigstore
@@ -233,6 +230,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Tue Jun 04 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1:1.2.4-2.inferit
+- Debranding
+- Rebuilt for MSVSphere 8.10
+
 * Tue Dec 12 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.2.4-2
 - Rebuilt for MSVSphere 8.8