From 4f8ebe5277814510030c9c4a75d7384aa1e71f3b Mon Sep 17 00:00:00 2001
From: Carl George <carl@george.computer>
Date: Oct 08 2018 15:08:36 +0000
Subject: Cleanup for readability


---

diff --git a/docker-compose.spec b/docker-compose.spec
index 1347257..ea38bfe 100644
--- a/docker-compose.spec
+++ b/docker-compose.spec
@@ -1,5 +1,3 @@
-%global debug_package %{nil}
-
 %if 0%{?rhel}
 # Currently python3_pkgversion is set to 34 when EPEL is enabled.  However, not
 # all our dependencies have python34-* subpackages yet.  Once they do, this
@@ -11,10 +9,10 @@ Name:           docker-compose
 Version:        1.22.0
 Release:        1%{?dist}
 Summary:        Multi-container orchestration for Docker
-
 License:        ASL 2.0
 URL:            https://github.com/docker/compose
-Source0:        https://files.pythonhosted.org/packages/source/d/%{name}/%{name}-%{version}.tar.gz
+Source0:        %pypi_source
+BuildArch:      noarch
 
 # Upstream uses environment markers to conditionally apply some dependencies.
 # Environment markers were first added in setuptools 20.6.8.
@@ -53,7 +51,6 @@ Requires:       python%{?python3_pkgversion}-backports-ssl_match_hostname >= 3.5
 Requires:       python%{?python3_pkgversion}-ipaddress >= 1.0.16
 %endif
 
-BuildArch:      noarch
 
 %description
 Compose is a tool for defining and running multi-container Docker
@@ -73,8 +70,10 @@ Using Compose is basically a three-step process.
 3. Lastly, run docker-compose up and Compose will start and run your
    entire app.
 
+
 %prep
 %autosetup -p 1
+rm -rf docker_compose.egg-info
 
 # Remove dependency version constraints not relevant in Fedora/EPEL
 sed -e 's/, < [0-9.]\+//' -i setup.py
@@ -82,8 +81,6 @@ sed -e 's/, < [0-9.]\+//' -i setup.py
 # https://github.com/docker/compose/issues/4884
 sed -e '/requests >= / s/2\.6\.1/2.6.0/' -i setup.py
 
-# Upstream uses an underscore here
-rm -r docker_compose.egg-info
 
 %build
 %if 0%{?python3_pkgversion}
@@ -92,6 +89,7 @@ rm -r docker_compose.egg-info
 %py2_build
 %endif
 
+
 %install
 %if 0%{?python3_pkgversion}
 %py3_install
@@ -102,9 +100,10 @@ install -D -p -m 644 contrib/completion/bash/docker-compose %{buildroot}%{_datad
 install -D -p -m 644 contrib/completion/zsh/_docker-compose %{buildroot}%{_datadir}/zsh/site-functions/_docker-compose
 install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_datadir}/fish/vendor_completions.d/docker-compose.fish
 
+
 %files
-%doc CHANGELOG.md README.rst
 %license LICENSE
+%doc CHANGELOG.md README.rst
 %{_bindir}/%{name}
 %if 0%{?python3_pkgversion}
 %{python3_sitelib}/*
@@ -115,6 +114,7 @@ install -D -p -m 644 contrib/completion/fish/docker-compose.fish %{buildroot}%{_
 %{_datadir}/zsh
 %{_datadir}/fish
 
+
 %changelog
 * Wed Jul 18 2018 Michael Hampton <error@ioerror.us> - 1.22.0-1
 - Update to 1.22.0