From 6d0908f6ae403842f45816562f01fe98968a6ce1aa95862d853111baca40cb9b Mon Sep 17 00:00:00 2001
From: Todd R <toddrme2178@gmail.com>
Date: Sat, 13 Apr 2013 10:28:42 +0000
Subject: [PATCH] Accepting request 163862 from devel:languages:python3

- Added requires and buildrequires python3.  It will not work properly without them on openSUSE < 12.3
- Cleanup some macros

OBS-URL: https://build.opensuse.org/request/show/163862
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools-git?expand=0&rev=9
---
 python-setuptools-git.changes  |  7 +++++++
 python-setuptools-git.spec     | 24 +++++++++++++-----------
 python3-setuptools-git.changes |  7 +++++++
 python3-setuptools-git.spec    | 24 +++++++++++++-----------
 4 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/python-setuptools-git.changes b/python-setuptools-git.changes
index 8091986..a975c5a 100644
--- a/python-setuptools-git.changes
+++ b/python-setuptools-git.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 12 11:13:01 UTC 2013 - toddrme2178@gmail.com
+
+- Added requires and buildrequires python3.  It will not work 
+  properly without them on openSUSE < 12.3
+- Cleanup some macros
+
 -------------------------------------------------------------------
 Mon Jan 21 15:38:52 UTC 2013 - p.drouand@gmail.com
 
diff --git a/python-setuptools-git.spec b/python-setuptools-git.spec
index a97df95..bea8dcc 100644
--- a/python-setuptools-git.spec
+++ b/python-setuptools-git.spec
@@ -18,14 +18,6 @@
 %define mod_name setuptools-git
 %define build_for_python3 0
 
-%if %{build_for_python3}
-%define local_python      python3
-%define local_sitelib     %{python3_sitelib}
-%else
-%define local_python      python
-%define local_sitelib     %{python_sitelib}
-%endif
-
 Name:           python-setuptools-git
 Version:        1.0b1
 Release:        0
@@ -35,19 +27,29 @@ Group:          Development/Languages/Python
 Url:            https://github.com/wichert/setuptools-git
 Source:         http://pypi.python.org/packages/source/s/setuptools-git/setuptools-git-%{version}.tar.gz
 %if %{build_for_python3}
+BuildRequires:  python
 BuildRequires:  python3-devel
 BuildRequires:	python3-distribute
+Requires:       python
+BuildArch:      noarch
 %else
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %else
 BuildArch:      noarch
 %endif
+%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%if %{build_for_python3}
+%define local_python      python3
+%define local_sitelib     %{python3_sitelib}
+%else
+%define local_python      python
+%define local_sitelib     %{python_sitelib}
+%endif
 
 %description
 This is a plugin for setuptools that enables git integration. Once
diff --git a/python3-setuptools-git.changes b/python3-setuptools-git.changes
index 8091986..a975c5a 100644
--- a/python3-setuptools-git.changes
+++ b/python3-setuptools-git.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 12 11:13:01 UTC 2013 - toddrme2178@gmail.com
+
+- Added requires and buildrequires python3.  It will not work 
+  properly without them on openSUSE < 12.3
+- Cleanup some macros
+
 -------------------------------------------------------------------
 Mon Jan 21 15:38:52 UTC 2013 - p.drouand@gmail.com
 
diff --git a/python3-setuptools-git.spec b/python3-setuptools-git.spec
index 5373c15..3a188eb 100644
--- a/python3-setuptools-git.spec
+++ b/python3-setuptools-git.spec
@@ -18,14 +18,6 @@
 %define mod_name setuptools-git
 %define build_for_python3 1
 
-%if %{build_for_python3}
-%define local_python      python3
-%define local_sitelib     %{python3_sitelib}
-%else
-%define local_python      python
-%define local_sitelib     %{python_sitelib}
-%endif
-
 Name:           python3-setuptools-git
 Version:        1.0b1
 Release:        0
@@ -35,19 +27,29 @@ Group:          Development/Languages/Python
 Url:            https://github.com/wichert/setuptools-git
 Source:         http://pypi.python.org/packages/source/s/setuptools-git/setuptools-git-%{version}.tar.gz
 %if %{build_for_python3}
+BuildRequires:  python3
 BuildRequires:  python3-devel
 BuildRequires:	python3-distribute
+Requires:       python3
+BuildArch:      noarch
 %else
 BuildRequires:  python-devel
 BuildRequires:  python-distribute
-%endif
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-%{!?python_sitearch: %global python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %else
 BuildArch:      noarch
 %endif
+%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%if %{build_for_python3}
+%define local_python      python3
+%define local_sitelib     %{python3_sitelib}
+%else
+%define local_python      python
+%define local_sitelib     %{python_sitelib}
+%endif
 
 %description
 This is a plugin for setuptools that enables git integration. Once