skopeo-1.2.1-4.el9

- define 8.4.0 branch for podman (v3.0)
- remove redundant source file

Signed-off-by: Jindrich Novy <jnovy@redhat.com>

rhel-shortnames.conf

@@ -12,6 +12,7 @@
 "3scale-amp2/system-rhel7" = "registry.access.redhat.com/repository/3scale-amp2/system-rhel7"
 "3scale-amp2/toolbox-rhel7" = "registry.access.redhat.com/repository/3scale-amp2/toolbox-rhel7"
 "3scale-amp2/zync-rhel7" = "registry.access.redhat.com/repository/3scale-amp2/zync-rhel7"
+"5gc/controller-amf-tmsp-amu" = "artnj.zte.com.cn/repository/5gc/controller-amf-tmsp-amu"
 "agile-lab/wasp-consumers-batch" = "registry.connect.redhat.com/repository/agile-lab/wasp-consumers-batch"
 "agile-lab/wasp-consumers-streaming" = "registry.connect.redhat.com/repository/agile-lab/wasp-consumers-streaming"
 "agile-lab/wasp-db" = "registry.connect.redhat.com/repository/agile-lab/wasp-db"
@@ -70,6 +71,7 @@
 "ansible-tower-37/ansible-tower-rhel7" = "registry.access.redhat.com/repository/ansible-tower-37/ansible-tower-rhel7"
 "ansible-tower-38/ansible-runner-rhel7" = "registry.access.redhat.com/repository/ansible-tower-38/ansible-runner-rhel7"
 "ansible-tower-38/ansible-tower-rhel7" = "registry.access.redhat.com/repository/ansible-tower-38/ansible-tower-rhel7"
+"antrea/antrea-operator" = "docker.io/repository/antrea/antrea-operator"
 "aporeto/enforcerd" = "registry.connect.redhat.com/repository/aporeto/enforcerd"
 "appdynamics/cluster-agent-operator-bundle" = "registry.connect.redhat.com/repository/appdynamics/cluster-agent-operator-bundle"
 "appdynamics/cluster-agent-operator" = "registry.connect.redhat.com/repository/appdynamics/cluster-agent-operator"
@@ -188,6 +190,7 @@
 "cambridgesemantics/anzograph-operator" = "registry.connect.redhat.com/repository/cambridgesemantics/anzograph-operator"
 "cambridgesemantics/anzograph" = "registry.connect.redhat.com/repository/cambridgesemantics/anzograph"
 "cambridgesemantics/anzo-microservices-leader" = "registry.connect.redhat.com/repository/cambridgesemantics/anzo-microservices-leader"
+"cambridgesemantics/anzo-operator-bundle" = "registry.connect.redhat.com/repository/cambridgesemantics/anzo-operator-bundle"
 "cambridgesemantics/anzo-operator" = "registry.connect.redhat.com/repository/cambridgesemantics/anzo-operator"
 "cambridgesemantics/anzo" = "registry.connect.redhat.com/repository/cambridgesemantics/anzo"
 "cambridgesemantics/anzo-unstructured-operator-bundle" = "registry.connect.redhat.com/repository/cambridgesemantics/anzo-unstructured-operator-bundle"
@@ -810,6 +813,8 @@
 "crunchydata/crunchydata" = "registry.connect.redhat.com/repository/crunchydata/crunchydata"
 "crunchydata/crunchy-grafana" = "registry.connect.redhat.com/repository/crunchydata/crunchy-grafana"
 "crunchydata/crunchy-pgadmin4" = "registry.connect.redhat.com/repository/crunchydata/crunchy-pgadmin4"
+"crunchydata/crunchy-pgbackrest" = "registry.connect.redhat.com/repository/crunchydata/crunchy-pgbackrest"
+"crunchydata/crunchy-pgbackrest-repo" = "registry.connect.redhat.com/repository/crunchydata/crunchy-pgbackrest-repo"
 "crunchydata/crunchy-pgbadger" = "registry.connect.redhat.com/repository/crunchydata/crunchy-pgbadger"
 "crunchydata/crunchy-pgbench" = "registry.connect.redhat.com/repository/crunchydata/crunchy-pgbench"
 "crunchydata/crunchy-pgbouncer" = "registry.connect.redhat.com/repository/crunchydata/crunchy-pgbouncer"
@@ -985,6 +990,7 @@
 "fuse7/fuse-ignite-server" = "registry.access.redhat.com/repository/fuse7/fuse-ignite-server"
 "fuse7/fuse-ignite-ui" = "registry.access.redhat.com/repository/fuse7/fuse-ignite-ui"
 "fuse7/fuse-ignite-upgrade" = "registry.access.redhat.com/repository/fuse7/fuse-ignite-upgrade"
+"fuse7/fuse-java-openshift-jdk11-rhel7" = "registry.access.redhat.com/repository/fuse7/fuse-java-openshift-jdk11-rhel7"
 "fuse7/fuse-java-openshift" = "registry.access.redhat.com/repository/fuse7/fuse-java-openshift"
 "fuse7/fuse-karaf-openshift" = "registry.access.redhat.com/repository/fuse7/fuse-karaf-openshift"
 "fuse7/fuse-online-operator-bundle" = "registry.access.redhat.com/repository/fuse7/fuse-online-operator-bundle"
@@ -1010,6 +1016,7 @@
 "h2oai/driverless-ai-operator" = "registry.connect.redhat.com/repository/h2oai/driverless-ai-operator"
 "h2oai/driverlessai-rhelubi7" = "registry.connect.redhat.com/repository/h2oai/driverlessai-rhelubi7"
 "h2oai/h2o-operator" = "registry.connect.redhat.com/repository/h2oai/h2o-operator"
+"h2oai/h2o" = "registry.connect.redhat.com/repository/h2oai/h2o"
 "haproxytech/haproxy" = "registry.connect.redhat.com/repository/haproxytech/haproxy"
 "hashicorp/vault-enterprise" = "registry.connect.redhat.com/repository/hashicorp/vault-enterprise"
 "hashicorp/vault-k8s" = "registry.connect.redhat.com/repository/hashicorp/vault-k8s"
@@ -1089,9 +1096,11 @@
 "ibm/couchdb-operator" = "registry.connect.redhat.com/repository/ibm/couchdb-operator"
 "ibm-edge/airgap-download-ui" = "registry.connect.redhat.com/repository/ibm-edge/airgap-download-ui"
 "ibm-edge/bas-operator-dashboard" = "registry.connect.redhat.com/repository/ibm-edge/bas-operator-dashboard"
+"ibm-edge/behavior-analytics-services-operator-bundle" = "registry.connect.redhat.com/repository/ibm-edge/behavior-analytics-services-operator-bundle"
 "ibm-edge/behavior-analytics-services-operator" = "registry.connect.redhat.com/repository/ibm-edge/behavior-analytics-services-operator"
 "ibm-edge/data-explorer-dashboard" = "registry.connect.redhat.com/repository/ibm-edge/data-explorer-dashboard"
 "ibm-edge/data-explorer-operator-bundle" = "registry.connect.redhat.com/repository/ibm-edge/data-explorer-operator-bundle"
+"ibm-edge/dataexplorer-operator-bundle" = "registry.connect.redhat.com/repository/ibm-edge/dataexplorer-operator-bundle"
 "ibm-edge/data-explorer-operator" = "registry.connect.redhat.com/repository/ibm-edge/data-explorer-operator"
 "ibm-edge/event-api" = "registry.connect.redhat.com/repository/ibm-edge/event-api"
 "ibm-edge/event-reader" = "registry.connect.redhat.com/repository/ibm-edge/event-reader"
@@ -1140,7 +1149,6 @@
 "ibm/open-liberty-operator-bundle" = "registry.connect.redhat.com/repository/ibm/open-liberty-operator-bundle"
 "ibm/open-liberty-operator" = "registry.connect.redhat.com/repository/ibm/open-liberty-operator"
 "ibm/open-liberty-samples" = "registry.connect.redhat.com/repository/ibm/open-liberty-samples"
-"ibm/operator-image" = "registry.connect.redhat.com/repository/ibm/operator-image"
 "ibm/pai4sk" = "registry.connect.redhat.com/repository/ibm/pai4sk"
 "ibm/pytorch" = "registry.connect.redhat.com/repository/ibm/pytorch"
 "ibm/redis3" = "registry.connect.redhat.com/repository/ibm/redis3"
@@ -1170,6 +1178,8 @@
 "integration/service-registry-streams-rhel8" = "registry.access.redhat.com/repository/integration/service-registry-streams-rhel8"
 "introspective-networks/smokevpn1" = "registry.connect.redhat.com/repository/introspective-networks/smokevpn1"
 "isovalent/cilium-olm" = "registry.connect.redhat.com/repository/isovalent/cilium-olm"
+"isovalent/cilium" = "registry.connect.redhat.com/repository/isovalent/cilium"
+"isovalent/operator-generic" = "registry.connect.redhat.com/repository/isovalent/operator-generic"
 "jboss-amq-6/amq63-openshift" = "registry.access.redhat.com/repository/jboss-amq-6/amq63-openshift"
 "jboss-datagrid-7/datagrid73-openj9-11-openshift-rhel8" = "registry.access.redhat.com/repository/jboss-datagrid-7/datagrid73-openj9-11-openshift-rhel8"
 "jboss-datagrid-7/datagrid73-openshift" = "registry.access.redhat.com/repository/jboss-datagrid-7/datagrid73-openshift"
@@ -1191,6 +1201,8 @@
 "jboss-eap-7/eap-xp1-openjdk11-runtime-openshift-rhel8" = "registry.access.redhat.com/repository/jboss-eap-7/eap-xp1-openjdk11-runtime-openshift-rhel8"
 "jboss-eap-7/eap-xp1-openjdk8-openshift-rhel7" = "registry.access.redhat.com/repository/jboss-eap-7/eap-xp1-openjdk8-openshift-rhel7"
 "jboss-eap-7/eap-xp1-openjdk8-runtime-openshift-rhel7" = "registry.access.redhat.com/repository/jboss-eap-7/eap-xp1-openjdk8-runtime-openshift-rhel7"
+"jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8" = "registry.access.redhat.com/repository/jboss-eap-7/eap-xp2-openj9-11-openshift-rhel8"
+"jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8" = "registry.access.redhat.com/repository/jboss-eap-7/eap-xp2-openj9-11-runtime-openshift-rhel8"
 "jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8" = "registry.access.redhat.com/repository/jboss-eap-7/eap-xp2-openjdk11-openshift-rhel8"
 "jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8" = "registry.access.redhat.com/repository/jboss-eap-7/eap-xp2-openjdk11-runtime-openshift-rhel8"
 "jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7" = "registry.access.redhat.com/repository/jboss-eap-7/eap-xp2-openjdk8-openshift-rhel7"
@@ -2036,8 +2048,6 @@
 "quarkus/mandrel-20-rhel8" = "registry.access.redhat.com/repository/quarkus/mandrel-20-rhel8"
 "quay/quay-container-security-rhel8-operator" = "registry.access.redhat.com/repository/quay/quay-container-security-rhel8-operator"
 "quay/quay-openshift-bridge-rhel8-operator" = "registry.access.redhat.com/repository/quay/quay-openshift-bridge-rhel8-operator"
-"quay/quay-rhel8-operator-metadata" = "registry.access.redhat.com/repository/quay/quay-rhel8-operator-metadata"
-"quay/quay-rhel8-operator" = "registry.access.redhat.com/repository/quay/quay-rhel8-operator"
 "realmethods/realmethods12" = "registry.connect.redhat.com/repository/realmethods/realmethods12"
 "realmethods/realmethods-operator-12" = "registry.connect.redhat.com/repository/realmethods/realmethods-operator-12"
 "redhat-openjdk-18/openjdk18-openshift" = "registry.access.redhat.com/repository/redhat-openjdk-18/openjdk18-openshift"
@@ -2550,10 +2560,12 @@
 "seldonio/alibi-detect-server" = "registry.connect.redhat.com/repository/seldonio/alibi-detect-server"
 "seldonio/alibiexplainer" = "registry.connect.redhat.com/repository/seldonio/alibiexplainer"
 "seldonio/kubectl" = "registry.connect.redhat.com/repository/seldonio/kubectl"
+"seldonio/mc-ubi" = "registry.connect.redhat.com/repository/seldonio/mc-ubi"
 "seldonio/mlflowserver-grpc" = "registry.connect.redhat.com/repository/seldonio/mlflowserver-grpc"
 "seldonio/mlflowserver" = "registry.connect.redhat.com/repository/seldonio/mlflowserver"
 "seldonio/mlflowserver-rest" = "registry.connect.redhat.com/repository/seldonio/mlflowserver-rest"
 "seldonio/mock-classifier" = "registry.connect.redhat.com/repository/seldonio/mock-classifier"
+"seldonio/seldon-batch-processor" = "registry.connect.redhat.com/repository/seldonio/seldon-batch-processor"
 "seldonio/seldon-core-executor" = "registry.connect.redhat.com/repository/seldonio/seldon-core-executor"
 "seldonio/seldon-core-operator-bundle" = "registry.connect.redhat.com/repository/seldonio/seldon-core-operator-bundle"
 "seldonio/seldon-core-operator" = "registry.connect.redhat.com/repository/seldonio/seldon-core-operator"
@@ -2588,6 +2600,7 @@
 "snapt/snaptadc" = "registry.connect.redhat.com/repository/snapt/snaptadc"
 "snyk/kubernetes-monitor" = "docker.io/repository/snyk/kubernetes-monitor"
 "snyk/kubernetes-operator" = "registry.hub.docker.com/repository/snyk/kubernetes-operator"
+"snyk/snyk-operator-bundle" = "registry.connect.redhat.com/repository/snyk/snyk-operator-bundle"
 "sonatype/nexus-iq-server" = "registry.connect.redhat.com/repository/sonatype/nexus-iq-server"
 "sonatype/nexus-repository-manager" = "registry.connect.redhat.com/repository/sonatype/nexus-repository-manager"
 "splunk/sck101" = "registry.connect.redhat.com/repository/splunk/sck101"
@@ -2597,14 +2610,17 @@
 "stackrox/main" = "registry.connect.redhat.com/repository/stackrox/main"
 "starburst/presto-operator-bundle" = "registry.connect.redhat.com/repository/starburst/presto-operator-bundle"
 "stf/prometheus-webhook-snmp" = "registry.access.redhat.com/repository/stf/prometheus-webhook-snmp"
+"stf/service-telemetry-operator-bundle" = "registry.access.redhat.com/repository/stf/service-telemetry-operator-bundle"
 "stf/service-telemetry-rhel7-operator" = "registry.access.redhat.com/repository/stf/service-telemetry-rhel7-operator"
 "stf/sg-bridge-rhel8" = "registry.access.redhat.com/repository/stf/sg-bridge-rhel8"
 "stf/sg-core-rhel8" = "registry.access.redhat.com/repository/stf/sg-core-rhel8"
+"stf/smart-gateway-operator-bundle" = "registry.access.redhat.com/repository/stf/smart-gateway-operator-bundle"
 "stf/smart-gateway-rhel7-operator" = "registry.access.redhat.com/repository/stf/smart-gateway-rhel7-operator"
 "stf/smart-gateway-rhel8" = "registry.access.redhat.com/repository/stf/smart-gateway-rhel8"
 "stonebranch/stonebranch-operator-bundle" = "registry.connect.redhat.com/repository/stonebranch/stonebranch-operator-bundle"
 "stonebranch/stonebranch-operator" = "registry.connect.redhat.com/repository/stonebranch/stonebranch-operator"
 "stonebranch/universalagent66" = "registry.connect.redhat.com/repository/stonebranch/universalagent66"
+"stonebranch/universal-agent" = "registry.connect.redhat.com/repository/stonebranch/universal-agent"
 "storageos/api-manager" = "registry.connect.redhat.com/repository/storageos/api-manager"
 "storageos/cluster-operator2-bundle" = "registry.connect.redhat.com/repository/storageos/cluster-operator2-bundle"
 "storageos/cluster-operator2" = "registry.connect.redhat.com/repository/storageos/cluster-operator2"
@@ -2687,6 +2703,7 @@
 "turbonomic/turbodif-operator" = "registry.connect.redhat.com/repository/turbonomic/turbodif-operator"
 "turbonomic/turbodif" = "registry.connect.redhat.com/repository/turbonomic/turbodif"
 "turbonomic/zookeeper" = "registry.connect.redhat.com/repository/turbonomic/zookeeper"
+"turnium/sdwan-controller" = "registry.multapplied.net/repository/turnium/sdwan-controller"
 "turnium/sdwan-hostrouter" = "registry.multapplied.net/repository/turnium/sdwan-hostrouter"
 "tw_buthokre5bmouxarnfhcruzgdyxjnfxj/twistlock/console" = "registry-auth.twistlock.com/repository/tw_buthokre5bmouxarnfhcruzgdyxjnfxj/twistlock/console"
 "twistlock/cloud-discovery" = "registry.connect.redhat.com/repository/twistlock/cloud-discovery"
@@ -2770,7 +2787,6 @@
 "yash/yashone2" = "registry.connect.redhat.com/repository/yash/yashone2"
 "yugabytedb/yugabyte-platform-operator-image" = "registry.connect.redhat.com/repository/yugabytedb/yugabyte-platform-operator-image"
 "yugabytedb/yugabyte-platform-operator" = "registry.connect.redhat.com/repository/yugabytedb/yugabyte-platform-operator"
-"yugabytedb/yugabyte-platform" = "registry.connect.redhat.com/repository/yugabytedb/yugabyte-platform"
 "yugabytedb/yugabyte" = "registry.connect.redhat.com/repository/yugabytedb/yugabyte"
 "zabbix/zabbix-agent2-50" = "registry.connect.redhat.com/repository/zabbix/zabbix-agent2-50"
 "zabbix/zabbix-agent-50" = "registry.connect.redhat.com/repository/zabbix/zabbix-agent-50"

skopeo.spec

@@ -11,24 +11,24 @@ go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl
 %endif
 
 %global import_path github.com/containers/skopeo
-#%%global branch release-1.2
+%global branch release-1.2
 # Bellow definitions are used to deliver config files from a particular branch
 # of c/image, c/common, c/storage vendored in all podman, skopeo, buildah.
 # These vendored components must have the same version. If it is not the case,
 # pick the oldest version on c/image, c/common, c/storage vendored in
 # podman/skopeo/podman.
-%global podman_branch master
+%global podman_branch v3.0
 %global image_branch  v5.9.0
 %global common_branch v0.33.0
 %global storage_branch v1.24.5
 %global shortnames_branch main
-%global commit0 bdb117ded6d37f0a6b0a2e28ba3213c20264ab43
+%global commit0 2e90a8af5a3aad76a3567d3bb84fbb07034ec1fd
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 Epoch: 1
 Name: skopeo
 Version: 1.2.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Inspect container images and repositories on registries
 License: ASL 2.0
 URL: %{git0}
@@ -236,6 +236,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
 %{_datadir}/%{name}/test
 
 %changelog
+* Sun Jan 31 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-4
+- define 8.4.0 branch for podman (v3.0)
+- remove redundant source file
+
 * Fri Jan 29 2021 Jindrich Novy <jnovy@redhat.com> - 1:1.2.1-3
 - convert subscription-manager from weak dep to a hint
 

sources

@@ -1 +1 @@
-SHA512 (skopeo-1.2.1-bdb117d.tar.gz) = 42f4c649fa3c0e343f1d396165f74b2c5e8703535ce6cdd633b82aaa7f8e7a6fb84a82c87e42b1f10a0a4ed5032092a07fa87fc0aafc99b106ccb16c883089b4
+SHA512 (release-1.2-2e90a8a.tar.gz) = 0bce32fefb589a74199f44ddc88cc6073ab535060153d8a2f271a476d8d65fe24984be9c0f0ecfce8084bd0e57018a02e99598af2a52409370f9625762338bf2