From 7e73334836458f2e8e5b091d8720d5b13a6023e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Terje=20R=C3=B8sten?= <terje.rosten@ntnu.no>
Date: Thu, 15 Mar 2018 20:16:44 +0100
Subject: [PATCH] Minor clean up

---
 python-configobj.spec | 70 ++++++++++++++++++++-----------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/python-configobj.spec b/python-configobj.spec
index efc4403..cadc135 100644
--- a/python-configobj.spec
+++ b/python-configobj.spec
@@ -1,11 +1,7 @@
-%global pypi_name configobj
-
-Name:           python-%{pypi_name}
+Name:           python-configobj
 Version:        5.0.6
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Config file reading, writing, and validation
-
-Group:          System Environment/Libraries
 License:        BSD
 URL:            http://configobj.readthedocs.org/
 # Moved to the github release instead of the pypi one since multiple elements (License and tests)
@@ -13,46 +9,36 @@ URL:            http://configobj.readthedocs.org/
 # https://github.com/DiffSK/configobj/issues/98
 # https://github.com/DiffSK/configobj/issues/99
 # Source0:        https://pypi.python.org/packages/source/c/configobj/configobj-5.0.6.tar.gz
-Source0:        https://github.com/DiffSK/%{pypi_name}/archive/v%{version}.tar.gz
+Source0:        https://github.com/DiffSK/configobj/archive/v%{version}.tar.gz
 BuildArch:      noarch
-
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-six
-%{?fc22:BuildRequires: pytest}
-%{!?fc22:BuildRequires: python2-pytest}
+BuildRequires:  python2-pytest
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-six
 BuildRequires:  python3-pytest
+%global _description \
+ConfigObj is a simple but powerful configuration file reader and writer: an ini\
+file round tripper. Its main feature is that it is very easy to use, with a\
+straightforward programmers interface and a simple syntax for config files. 
+%description %_description
 
-%description
-ConfigObj is a simple but powerful configuration file reader and writer: an ini
-file round tripper. Its main feature is that it is very easy to use, with a
-straightforward programmer's interface and a simple syntax for config files. 
-
-%package -n     python2-%{pypi_name}
-Summary:        Config file reading, writing and validation
-%{?python_provide:%python_provide python2-%{pypi_name}}
-
+%package     -n python2-configobj
+Summary:        %{summary}
+%{?python_provide:%python_provide python2-configobj}
 Requires:       python2-six
-%description -n python2-%{pypi_name}
-ConfigObj is a simple but powerful configuration file reader and writer: an ini
-file round tripper. Its main feature is that it is very easy to use, with a
-straightforward programmer's interface and a simple syntax for config files.
-
-%package -n python3-configobj
-Summary:        Config file reading, writing, and validation for Python 3
-%{?python_provide:%python_provide python3-%{pypi_name}}
+%description -n python2-configobj %_description
 
+%package     -n python3-configobj
+Summary:        %{summary}
+%{?python_provide:%python_provide python3-configobj}
 Requires:       python3-six
-%description -n python3-configobj
-ConfigObj is a simple but powerful configuration file reader and writer: an ini
-file round tripper. Its main feature is that it is very easy to use, with a
-straightforward programmer's interface and a simple syntax for config files. 
+%description -n python3-configobj %_description
 
 %prep
-%autosetup -n %{pypi_name}-%{version}
+%autosetup -n configobj-%{version}
 
 %build
 %py2_build
@@ -70,19 +56,27 @@ py.test-%{python2_version} tests
 %{__python3} test_configobj.py
 py.test-%{python3_version} tests
 
-%files -n python2-%{pypi_name}
+%files -n python2-configobj
 %doc README.md
 %license LICENSE
-%{python2_sitelib}/*
-%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%{python2_sitelib}/_version.py*
+%{python2_sitelib}/configobj.py*
+%{python2_sitelib}/validate.py*
+%{python2_sitelib}/configobj-%{version}-py?.?.egg-info
 
-%files -n python3-%{pypi_name}
+%files -n python3-configobj
 %doc README.md
 %license LICENSE
-%{python3_sitelib}/*
-%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
+%{python3_sitelib}/_version.py
+%{python3_sitelib}/configobj.py
+%{python3_sitelib}/validate.py
+%{python3_sitelib}/__pycache__/*
+%{python3_sitelib}/configobj-%{version}-py?.?.egg-info
 
 %changelog
+* Thu Mar 15 2018 Terje Rosten <terje.rosten@ntnu.no> - 5.0.6-12
+- Minor clean up
+
 * Tue Mar 13 2018 Iryna Shcherbina <ishcherb@redhat.com> - 5.0.6-11
 - Update Python 2 dependency declarations to new packaging standards
   (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)