From 511c795841e162c269ed31435d73d713c8b0db73 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters>
Date: Fri, 2 Jun 2017 16:12:01 -0400
Subject: [PATCH] Rework to use %setup again

We currently use [rpmdistro-gitoverlay](https://github.com/cgwalters/rpmdistro-gitoverlay)
for [FAHC](https://pagure.io/fedora-atomic-host-continuous) which
builds this package.

However, rdgo is [not aware of multi-source packages](https://github.com/cgwalters/rpmdistro-gitoverlay/issues/24)
and fixing it would be nontrivial.

This gets us back to a place where FAHC at least will ship `atomic`
from git, even if not `registries`.

Implementation wise, there were a lot of tricky things to debug here
because using `%setup` implies changing to the default `Source0` in various
steps.  So we have to explicitly "bounce out" with `cd ..`.
---
 atomic.spec | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/atomic.spec b/atomic.spec
index a6a7b5f..098a678 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -121,28 +121,25 @@ BuildRequires: automake
 Utility that parses a global YAML registry file for container runtimes.
 
 %prep
-tar zxf %{SOURCE0}
+%setup -qn %{name}-%{commit}
+cd ..
 tar zxf %{SOURCE1}
-pushd atomic-%{commit}
-if [ %{pypkg} == 'python3' ]; then
-sed -i 's/input = raw_input/pass/' Atomic/util.py
-fi
-popd
 
+%build
+cd ..
 pushd registries-%{commit_atomic_registries}
 sh ./autogen.sh
 %configure
-
-%build
+%make_build
+popd
 pushd atomic-%{commit}
+if [ %{pypkg} == 'python3' ]; then
+    sed -i 's/input = raw_input/pass/' Atomic/util.py
+fi
 make PYTHON=%{__python} PYLINT=true all
 popd
 
-pushd registries-%{commit_atomic_registries}
-%make_build
-
 %install
-pushd atomic-%{commit}
 make PYTHON=%{__python}  install-only DESTDIR=%{buildroot}
 install -dp %{buildroot}%{_sharedstatedir}/containers/%{name}
 
@@ -163,7 +160,7 @@ for line in sys.argv[1:]:
     else:
         sys.stderr.write('{0} did not match any files\n'.format(line))
 EOF
-%{pypkg} autofiles.py > files \
+%{pypkg} autofiles.py > atomic.files \
   '%{pysitelib}/Atomic' \
   '%{pysitelib}/%{name}*.egg-info' \
   '%{_sysconfdir}/%{name}.conf' \
@@ -176,8 +173,8 @@ EOF
   '%{_datadir}/dbus-1/system-services/org.%{name}.service' \
   '%{_datadir}/polkit-1/actions/org.%{name}.policy' \
   '%{_mandir}/man1/%{name}*'
-popd
 
+cd ..
 pushd registries-%{commit_atomic_registries}
 %make_install
 install -d %{buildroot}%{_sysconfdir}/containers/
@@ -188,24 +185,22 @@ popd
 
 
 %check
-pushd atomic-%{commit}
 [ ! -w /run/docker.sock ] || make PYTHON=%{__python} test
-popd
 
 #define license tag if not already defined
 %{!?_licensedir:%global license %doc}
 
-%files -f atomic-%{commit}/files
-%license atomic-%{commit}/COPYING
-%doc atomic-%{commit}/README.md
+%files -f atomic.files
+%license COPYING
+%doc README.md
 %config(noreplace) %{_sysconfdir}/sysconfig/%{name}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.%{name}.conf
 %dir %{_sharedstatedir}/containers
 %dir %{_sharedstatedir}/containers/%{name}
 
 %files registries
-%license registries-%{commit_atomic_registries}/COPYING 
-%doc registries-%{commit_atomic_registries}/README.md
+%license ../registries-%{commit_atomic_registries}/COPYING 
+%doc ../registries-%{commit_atomic_registries}/README.md
 %{_libexecdir}/registries
 %{_mandir}/man1/registries*
 %config(noreplace) %{_sysconfdir}/containers/registries.conf
-- 
2.9.4