up to 1.11; finished .spec

diff --git a/python-sh.spec b/python-sh.spec
index 49398198c662f7c599b23bea9bcf64168a445608..bc1b0589fbcdf5b105525c3461aa37cc0fe7521b 100644 (file)
--- a/python-sh.spec
+++ b/python-sh.spec
@@ -3,41 +3,35 @@
 %bcond_without python2 # CPython 2.x module
 %bcond_without python3 # CPython 3.x module
 
-%define        module  sh
-Summary:       SH module for python
-Summary(pl.UTF-8):     Moduł sh dla pythona
-# Name must match the python module/package name (as in 'import' statement)
+%define        module          sh
+%define        egg_name        sh
+%define                pypi_name       sh
+Summary:       Python subprocess interface
 Name:          python-%{module}
-Version:       1.08
+Version:       1.11
 Release:       1
-License:       Free for use
+License:       MIT
 Group:         Libraries/Python
-Source0:       https://github.com/amoffat/sh/archive/%{version}.tar.gz
-# Source0-md5: a89e4600d9500210b78dbcefad63b443
+Source0:       https://files.pythonhosted.org/packages/source/s/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
+# Source0-md5: 7af8df6c92d29ff927b6db0146bddec3
 URL:           https://amoffat.github.io/sh/
-# remove BR: python-devel for 'noarch' packages.
 BuildRequires: rpm-pythonprov
-# if py_postclean is used
 BuildRequires: rpmbuild(macros) >= 1.710
-# when using /usr/bin/env or other in-place substitutions
-#BuildRequires:        sed >= 4.0
 %if %{with python2}
-BuildRequires: python-devel
-BuildRequires: python-distribute
+BuildRequires: python-modules >= 1:2.6
+BuildRequires: python-setuptools
 %endif
 %if %{with python3}
-BuildRequires: python3-devel
-BuildRequires: python3-distribute
 BuildRequires: python3-modules
+BuildRequires: python3-setuptools
 %endif
-#Requires:             python-libs
-Requires:              python-modules
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-
-%description -l pl.UTF-8
+sh (previously pbs) is a full-fledged subprocess replacement for
+Python 2.6 - 3.4 that allows you to call any program as if it were a
+function
 
 %package -n python3-%{module}
 Summary:       SH module for python 3
@@ -45,8 +39,9 @@ Summary(pl.UTF-8):    Moduł sh dla pythona 3
 Group:         Libraries/Python
 
 %description -n python3-%{module}
-
-%description -n python3-%{module} -l pl.UTF-8
+sh (previously pbs) is a full-fledged subprocess replacement for
+Python 2.6 - 3.4 that allows you to call any program as if it were a
+function
 
 %prep
 %setup -q -n %{module}-%{version}
@@ -62,10 +57,8 @@ Group:               Libraries/Python
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
 %if %{with python2}
 %py_install
-
 %py_postclean
 %endif
 
@@ -73,7 +66,6 @@ rm -rf $RPM_BUILD_ROOT
 %py3_install
 %endif
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -81,18 +73,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS.md CHANGELOG.md README.md
-%{py_sitescriptdir}/*.py[co]
-%if "%{py_ver}" > "2.4"
-%{py_sitescriptdir}/sh-*.egg-info
-%endif
+%{py_sitescriptdir}/%{module}.py[co]
+%{py_sitescriptdir}/%{egg_name}-*-py*.egg-info
 %endif
 
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
 %doc AUTHORS.md CHANGELOG.md README.md
-%{py3_sitescriptdir}/*.py
-%{py3_sitescriptdir}/__pycache__
-%{py3_sitescriptdir}/%{module}-*.egg-info
+%{py3_sitescriptdir}/__pycache__/%{module}.*.pyc
+%{py3_sitescriptdir}/%{module}.py
+%{py3_sitescriptdir}/%{egg_name}-*-py*.egg-info
 %endif
-