From e6a30893bf84d73f258305afddc96748bed85c2337d443f96484c922f771d232 Mon Sep 17 00:00:00 2001
From: James Fehlig <jfehlig@suse.com>
Date: Tue, 27 Oct 2020 17:39:49 +0000
Subject: [PATCH] Fix binary names for several CDI components

OBS-URL: https://build.opensuse.org/package/show/Virtualization/containerized-data-importer?expand=0&rev=3
---
 containerized-data-importer.changes |  5 +++
 containerized-data-importer.spec    | 51 ++++++++++++-----------------
 2 files changed, 26 insertions(+), 30 deletions(-)

diff --git a/containerized-data-importer.changes b/containerized-data-importer.changes
index 0d639a4..b887ae5 100644
--- a/containerized-data-importer.changes
+++ b/containerized-data-importer.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 27 17:11:40 UTC 2020 - James Fehlig <jfehlig@suse.com>
+
+- spec: Fix binary names for several CDI components
+
 -------------------------------------------------------------------
 Mon Oct 26 19:37:49 UTC 2020 - jfehlig@suse.com
 
diff --git a/containerized-data-importer.spec b/containerized-data-importer.spec
index 0d17838..4d1d1e1 100644
--- a/containerized-data-importer.spec
+++ b/containerized-data-importer.spec
@@ -42,7 +42,7 @@ Group:          System/Packages
 The containerized-data-importer-api package provides the kubernetes API extension for CDI
 
 %package        cloner
-Summary:        cloner for host assisted cloning
+Summary:        Cloner for host assisted cloning
 Group:          System/Packages
 
 %description    cloner
@@ -112,35 +112,26 @@ CDI_GIT_TREE_STATE="clean" \
 %install
 mkdir -p %{buildroot}%{_bindir}
 
-chmod 0755 _out/cmd/cdi-apiserver/cdi-apiserver
-install -p -m 0755 _out/cmd/cdi-apiserver/cdi-apiserver %{buildroot}%{_bindir}/
+install -p -m 0755 _out/cmd/cdi-apiserver/cdi-apiserver %{buildroot}%{_bindir}/virt-cdi-apiserver
 
-chmod 0755 cmd/cdi-cloner/cloner_startup.sh
 install -p -m 0755 cmd/cdi-cloner/cloner_startup.sh %{buildroot}%{_bindir}/
-chmod 0755 _out/cmd/cdi-cloner/cdi-cloner
 install -p -m 0755 _out/cmd/cdi-cloner/cdi-cloner %{buildroot}%{_bindir}/
 
-chmod 0755 _out/cmd/cdi-controller/cdi-controller
-install -p -m 0755 _out/cmd/cdi-controller/cdi-controller %{buildroot}%{_bindir}/
+install -p -m 0755 _out/cmd/cdi-controller/cdi-controller %{buildroot}%{_bindir}/virt-cdi-controller
 
-chmod 0755 _out/cmd/cdi-importer/cdi-importer
-install -p -m 0755 _out/cmd/cdi-importer/cdi-importer %{buildroot}%{_bindir}/
+install -p -m 0755 _out/cmd/cdi-importer/cdi-importer %{buildroot}%{_bindir}/virt-cdi-importer
 
-chmod 0755 _out/cmd/cdi-operator/cdi-operator
-install -p -m 0755 _out/cmd/cdi-operator/cdi-operator %{buildroot}%{_bindir}/
-chmod 0755 _out/tools/csv-generator/csv-generator
+install -p -m 0755 _out/cmd/cdi-operator/cdi-operator %{buildroot}%{_bindir}/virt-cdi-operator
 install -p -m 0755 _out/tools/csv-generator/csv-generator %{buildroot}%{_bindir}/
 
-chmod 0755 _out/cmd/cdi-uploadproxy/cdi-uploadproxy
-install -p -m 0755 _out/cmd/cdi-uploadproxy/cdi-uploadproxy %{buildroot}%{_bindir}/
+install -p -m 0755 _out/cmd/cdi-uploadproxy/cdi-uploadproxy %{buildroot}%{_bindir}/virt-cdi-uploadproxy
 
-chmod 0755 _out/cmd/cdi-uploadserver/cdi-uploadserver
-install -p -m 0755 _out/cmd/cdi-uploadserver/cdi-uploadserver %{buildroot}%{_bindir}/
+install -p -m 0755 _out/cmd/cdi-uploadserver/cdi-uploadserver %{buildroot}%{_bindir}/virt-cdi-uploadserver
 
 %files api
 %license LICENSE
 %doc README.md
-%{_bindir}/cdi-apiserver
+%{_bindir}/virt-cdi-apiserver
 
 %files cloner
 %license LICENSE
@@ -151,27 +142,27 @@ install -p -m 0755 _out/cmd/cdi-uploadserver/cdi-uploadserver %{buildroot}%{_bin
 %files controller
 %license LICENSE
 %doc README.md
-%{_bindir}/cdi-controller
+%{_bindir}/virt-cdi-controller
 
 %files importer
 %license LICENSE
 %doc README.md
-%{_bindir}/cdi-importer
-
-%files uploadproxy
-%license LICENSE
-%doc README.md
-%{_bindir}/cdi-uploadproxy
-
-%files uploadserver
-%license LICENSE
-%doc README.md
-%{_bindir}/cdi-uploadserver
+%{_bindir}/virt-cdi-importer
 
 %files operator
 %license LICENSE
 %doc README.md
-%{_bindir}/cdi-operator
+%{_bindir}/virt-cdi-operator
 %{_bindir}/csv-generator
 
+%files uploadproxy
+%license LICENSE
+%doc README.md
+%{_bindir}/virt-cdi-uploadproxy
+
+%files uploadserver
+%license LICENSE
+%doc README.md
+%{_bindir}/virt-cdi-uploadserver
+
 %changelog