From b3b528c65331c35cbdf35d2c4caae6f9daa03333 Mon Sep 17 00:00:00 2001
From: Lokesh Mandvekar <lsm5@fedoraproject.org>
Date: Tue, 12 May 2020 14:38:05 -0400
Subject: [PATCH] podman-2:2.0.0-0.13.dev.git5b4e91d

- disable remote package

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
---
 .gitignore  |  1 +
 podman.spec | 43 +++++++++++++++++++++++--------------------
 sources     |  2 +-
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/.gitignore b/.gitignore
index c0cf78f..6605e18 100644
--- a/.gitignore
+++ b/.gitignore
@@ -921,3 +921,4 @@
 /libpod-084cfb8.tar.gz
 /libpod-155a7d6.tar.gz
 /libpod-8857ba2.tar.gz
+/libpod-5b4e91d.tar.gz
diff --git a/podman.spec b/podman.spec
index 51f311c..b3d540c 100644
--- a/podman.spec
+++ b/podman.spec
@@ -29,10 +29,9 @@
 %global project containers
 %global repo libpod
 # https://github.com/containers/libpod
-%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
-%global import_path %{provider_prefix}
-%global git0 https://%{provider}.%{provider_tld}/%{project}/%{repo}
-%global commit0 8857ba20a0651e8fa71762da90d774e3aa290883
+%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
+%global git0 https://%{import_path}
+%global commit0 5b4e91db73a80f31f67b7c28832527e64b074b74
 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
 
 %global repo_plugins dnsname
@@ -55,7 +54,7 @@ Epoch: 0
 Version: 2.0.0
 # Rawhide almost always ships unreleased builds,
 # so release tag should be of the form 0.N.blahblah
-Release: 0.12.dev.git%{shortcommit0}%{?dist}
+Release: 0.13.dev.git%{shortcommit0}%{?dist}
 Summary: Manage Pods, Containers and Container Images
 License: ASL 2.0
 URL: https://%{name}.io/
@@ -463,8 +462,8 @@ export BUILDTAGS+="exclude_graphdriver_btrfs containers_image_ostree_stub"
 %gobuild -o bin/%{name} %{import_path}/cmd/%{name}
 
 # build %%{name}-remote
-export BUILDTAGS+=" remoteclient"
-%gobuild -o bin/%{name}-remote %{import_path}/cmd/%{name}
+#export BUILDTAGS+=" remoteclient"
+#%%gobuild -o bin/%%{name}-remote %%{import_path}/cmd/%%{name}
 
 pushd dnsname-%{commit_plugins}
 mkdir _build
@@ -481,21 +480,22 @@ popd
 %if 0%{?fedora}
 sed -s 's/^runtime[ =].*"runc/runtime = "crun/' libpod.conf  -i
 %endif
-sed -i 's/install.remote: podman-remote/install.remote:/' Makefile
-sed -i 's/install.bin: podman/install.bin:/' Makefile
 rm -rf docs/containers-mounts.conf.5.md
 
 install -dp %{buildroot}%{_unitdir}
 PODMAN_VERSION=%{version} %{__make} PREFIX=%{buildroot}%{_prefix} ETCDIR=%{buildroot}%{_sysconfdir} \
         install.bin \
-%if 0%{?fedora}
-        install.remote \
-%endif
         install.man \
         install.cni \
         install.systemd \
         install.completions \
         install.docker
+#%%if 0%%{?fedora}
+#install.remote \
+#%%endif
+
+rm %{buildroot}%{_mandir}/man1/*remote*
+rm %{buildroot}%{_mandir}/man5/*remote*
 
 mv pkg/hooks/README.md pkg/hooks/README-hooks.md
 
@@ -515,9 +515,9 @@ done
 
 # do not install remote manpages on centos7
 %if 0%{?centos} && 0%{?centos} < 8
-rm -rf %{buildroot}%{_mandir}/man1/docker-remote.1
-rm -rf %{buildroot}%{_mandir}/man1/%{name}-remote.1
-rm -rf %{buildroot}%{_mandir}/man5/%{name}-remote.conf.5
+#rm -rf %%{buildroot}%%{_mandir}/man1/docker-remote.1
+#rm -rf %%{buildroot}%%{_mandir}/man1/%%{name}-remote.1
+#rm -rf %%{buildroot}%%{_mandir}/man5/%%{name}-remote.conf.5
 %endif
 
 # source codes for building projects
@@ -641,11 +641,11 @@ exit 0
 
 #### DO NOT REMOVE - NEEDED FOR CENTOS
 %if 0%{?fedora}
-%files remote
-%license LICENSE
-%{_bindir}/%{name}-remote
-%{_datadir}/man/man1/%{name}-remote*.*
-%{_datadir}/man/man5/%{name}-remote*.*
+#%%files remote
+#%%license LICENSE
+#%%{_bindir}/%%{name}-remote
+#%%{_datadir}/man/man1/%%{name}-remote*.*
+#%%{_datadir}/man/man5/%%{name}-remote*.*
 
 %files tests
 %license LICENSE
@@ -658,6 +658,9 @@ exit 0
 %{_libexecdir}/cni/dnsname
 
 %changelog
+* Tue May 12 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-0.13.dev.git5b4e91d
+- disable remote package
+
 * Mon May 11 2020 Lokesh Mandvekar <lsm5@fedoraproject.org> - 2:2.0.0-0.12.dev.git8857ba2
 - gating test fix attempt by Ed Santiago <santiago@redhat.com>
 
diff --git a/sources b/sources
index 9173319..4e5eb19 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (dnsname-f5af33d.tar.gz) = 564555ef83f9bf70560bfdaf864112d62c318b83827400e65d8cbca6deed0813cafdef222c32ada4f596ad60fe4d9753286e65b577a73c85915bd46fc550cadc
-SHA512 (libpod-8857ba2.tar.gz) = 2cee235c383de454c5574b20d2147fc588adb56f55a718faa986f5d5eac49467dc74f27dc4c782a9f176c1c73f10681f3ba2f8c6500018dcd02d2d0cd78bf7a6
+SHA512 (libpod-5b4e91d.tar.gz) = 3266019ffdacbf3d5c4da2d2738993d9dc4c103bab1152096e16f593509fd55e80cacec71d7f08736b7c0190f9c83223b13e8ea6969bc12ea50d707f50d9cffa