From 95813570a9121caf9509d25dae36dc703ba2c4fa Mon Sep 17 00:00:00 2001
From: Ricky Elrod <ricky@elrod.me>
Date: Jan 03 2017 02:46:34 +0000
Subject: nuke python-version-specific subpackages; just use py3 if we can...


Signed-off-by: Ricky Elrod <ricky@elrod.me>

---

diff --git a/httpie.spec b/httpie.spec
index 2b2ab05..1db7722 100644
--- a/httpie.spec
+++ b/httpie.spec
@@ -4,7 +4,7 @@
 
 Name:           httpie
 Version:        0.9.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Curl-like tool for humans
 
 Group:          Applications/Internet
@@ -39,54 +39,6 @@ HTTPie does so by providing an http command that allows for issuing arbitrary
 HTTP requests using a simple and natural syntax and displaying colorized
 responses.
 
-%package -n python2-httpie
-Summary:        A Curl-like tool for humans
-Group:          Applications/Internet
-%{?python_provide:%python_provide python2-httpie}
-%if 0%{?with_python3}
-# Then the python3 package below will provide "httpie"
-%else
-# Otherwise, the python2 package here will provide it.
-Provides:       httpie%{?_isa} = %{version}-%{release}
-Obsoletes:      httpie < 0.9.3-2
-%endif
-
-Requires:       python2
-Requires:       python-pygments
-Requires:       python-requests
-
-%description -n python2-httpie
-HTTPie is a CLI HTTP utility built out of frustration with existing tools. The
-goal is to make CLI interaction with HTTP-based services as human-friendly as
-possible.
-
-HTTPie does so by providing an http command that allows for issuing arbitrary
-HTTP requests using a simple and natural syntax and displaying colorized
-responses.
-
-
-%if 0%{?with_python3}
-%package -n python3-httpie
-Summary:        A Curl-like tool for humans
-Group:          Applications/Internet
-%{?python_provide:%python_provide python3-httpie}
-Provides:       httpie%{?_isa} = %{version}-%{release}
-Obsoletes:      httpie < 0.9.3-2
-
-Requires:       python3
-Requires:       python3-pygments
-Requires:       python3-requests
-
-%description -n python3-httpie
-HTTPie is a CLI HTTP utility built out of frustration with existing tools. The
-goal is to make CLI interaction with HTTP-based services as human-friendly as
-possible.
-
-HTTPie does so by providing an http command that allows for issuing arbitrary
-HTTP requests using a simple and natural syntax and displaying colorized
-responses.
-%endif
-
 %prep
 %setup -q
 sed -i '/#!\/usr\/bin\/env/d' %{name}/__main__.py
@@ -115,69 +67,37 @@ popd
 %if 0%{?with_python3}
 pushd %{py3dir}
 %{__python3} setup.py install --skip-build --root %{buildroot}
-mv %{buildroot}/%{_bindir}/http %{buildroot}/%{_bindir}/python3-http
 popd
-%endif
-
+%else
 %{__python2} setup.py install --root %{buildroot}
-mv %{buildroot}/%{_bindir}/http %{buildroot}/%{_bindir}/python2-http
+%endif
 
 export PYTHONPATH=%{buildroot}%{python2_sitelib}
 
-# Create a link to the default executable
-%if 0%{?with_python3}
-ln -s python3-http %{buildroot}/%{_bindir}/http
-%else
-ln -s python2-http %{buildroot}/%{_bindir}/http
-%endif
-
 # Generate man pages for everything
-%if 0%{?fedora}
 mkdir -p %{buildroot}/%{_mandir}/man1
 help2man --no-discard-stderr %{buildroot}/%{_bindir}/http > %{buildroot}/%{_mandir}/man1/http.1
-help2man --no-discard-stderr %{buildroot}/%{_bindir}/python2-http > %{buildroot}/%{_mandir}/man1/python2-http.1
-%if 0%{?with_python3}
-help2man --no-discard-stderr %{buildroot}/%{_bindir}/python3-http > %{buildroot}/%{_mandir}/man1/python3-http.1
-%endif
-%endif
 
 
-%files -n python2-httpie
+%files
 %doc README.rst
 %license LICENSE
-%{python2_sitelib}/%{name}/
-%{python2_sitelib}/%{name}-%{version}*
-
-%if 0%{?with_python3}
-%{_bindir}/python2-http
-%if 0%{?fedora}
-%{_mandir}/man1/python2-http.1*
-%endif
-%else
-%{_bindir}/http
-%{_bindir}/python2-http
-%if 0%{?fedora}
 %{_mandir}/man1/http.1*
-%{_mandir}/man1/python2-http.1*
-%endif
-%endif
+%{_bindir}/http
 
 %if 0%{?with_python3}
-%files -n python3-httpie
-%doc README.rst
-%license LICENSE
 %{python3_sitelib}/%{name}/
 %{python3_sitelib}/%{name}-%{version}*
-
-%{_bindir}/http
-%{_bindir}/python3-http
-%if 0%{?fedora}
-%{_mandir}/man1/http.1*
-%{_mandir}/man1/python3-http.1*
-%endif
+%else
+%{python2_sitelib}/%{name}/
+%{python2_sitelib}/%{name}-%{version}*
 %endif
 
+
 %changelog
+* Mon Jan 2 2017 Ricky Elrod <relrod@redhat.com> - 0.9.4-4
+- Nuke python-version-specific subpackages. Just use py3 if we can.
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.9.4-3
 - Rebuild for Python 3.6