From 204a66801e3327a7e1ff7cd75a80817004e66cc595e4fa2b1db0ec85f6aaa5f7 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <thomasbechtold@jpberlin.de>
Date: Wed, 29 Jul 2015 05:51:22 +0000
Subject: [PATCH] - Unify spec file

OBS-URL: https://build.opensuse.org/package/show/Cloud:OpenStack:Factory/python-oslo.config?expand=0&rev=27
---
 python-oslo.config.changes |  5 +++++
 python-oslo.config.spec    | 22 +++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/python-oslo.config.changes b/python-oslo.config.changes
index 8a7e523..dff5052 100644
--- a/python-oslo.config.changes
+++ b/python-oslo.config.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 29 05:40:13 UTC 2015 - tbechtold@suse.com
+
+- Unify spec file
+
 -------------------------------------------------------------------
 Wed Jun 10 17:43:47 UTC 2015 - tbechtold@suse.com
 
diff --git a/python-oslo.config.spec b/python-oslo.config.spec
index d23a627..9cc3536 100644
--- a/python-oslo.config.spec
+++ b/python-oslo.config.spec
@@ -22,10 +22,11 @@ Release:        0
 Summary:        OpenStack configuration API
 License:        Apache-2.0
 Group:          Development/Languages/Python
-Url:            https://launchpad.net/oslo/
+Url:            https://launchpad.net/oslo.config/
 Source:         http://tarballs.openstack.org/oslo.config/oslo.config-%{version}.tar.gz
 Source99:       rpmlintrc
 BuildRequires:  fdupes
+BuildRequires:  openstack-suse-macros
 BuildRequires:  python-devel
 # Test requirements:
 BuildRequires:  python-fixtures >= 0.3.14
@@ -70,30 +71,21 @@ This package contains documentation files for %{name}.
 %setup -q -n oslo.config-%{version}
 
 %build
-python setup.py build
-python setup.py build_sphinx && rm doc/build/html/.buildinfo
+%{__python2} setup.py build
+%{__python2} setup.py build_sphinx && rm doc/build/html/.buildinfo
 
 %install
-python setup.py install --skip-build --root=%{buildroot} --prefix=%{_prefix} --install-data=%{python_sitelib}
+%{__python2} setup.py install --skip-build --root %{buildroot}
 %fdupes doc
 
-%check
-# NOTE(saschpe): oslo.sphinx puts a *.pth file into %{python_sitelib} (an EPIC FAIL for itself), oslo.config also
-# has one in $BUILDROOT. But the former takes precedence since %{python_sitelib} is always last sys.path. Thus
-# tests can never find the oslo.config module. Obviously PYTHONPATH alone won't help either. But distro-boys
-# have bigger balls than stackers and fix themselves a custom load order with the magic '-S' flag:
-#export PYTHONPATH="%{buildroot}%{python_sitelib}:%{python_sitelib}"
-#export PYTHON="python -S"
-#testr init && testr run --parallel
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE README.rst AUTHORS
 %{_bindir}/oslo-config-generator
 %{python_sitelib}/oslo
-%{python_sitelib}/oslo_config
-%{python_sitelib}/*.egg-info
 %{python_sitelib}/*-nspkg.pth
+%{python2_sitelib}/oslo_config
+%{python2_sitelib}/*.egg-info
 
 %files doc
 %defattr(-,root,root,-)