take out singlespec changes to submit to factory, putting back in later

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pytz?expand=0&rev=54

python-pytz.changes

@@ -1,26 +1,9 @@
--------------------------------------------------------------------
-Mon Mar 13 19:31:04 UTC 2017 - jmatejek@suse.com
-
-- singlespec tweaks
-
--------------------------------------------------------------------
-Mon Mar 13 18:08:26 UTC 2017 - astieger@suse.com
-
-- re-add and fix system_zoneinfo.patch which was dropped in error
-  boo#1029120
-
 -------------------------------------------------------------------
 Thu Mar  2 16:39:42 UTC 2017 - astieger@suse.com
 
 - update to 2016.10:
   * includes IANA 2016j
   * No longer fails with timezone-2017a bsc#1027705
-  * drop upstreamed system_zoneinfo.patch
-
--------------------------------------------------------------------
-Mon Dec 19 17:43:19 UTC 2016 - jmatejek@suse.com
-
-- update for multipython build
 
 -------------------------------------------------------------------
 Mon Apr 25 08:10:27 UTC 2016 - astieger@suse.com

python-pytz.spec

@@ -16,8 +16,6 @@
 #
 
 
-%{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define oldpython python
 Name:           python-pytz
 Version:        2016.10
 Release:        0
@@ -33,21 +31,20 @@ Patch0:         fix-tests.patch
 # PATCH-FEATURE-OPENSUSE -- Use system tz database (Olson database)
 Patch1:         system_zoneinfo.patch
 Requires:       timezone
-BuildRequires:  %{python_module devel}
-BuildRequires:  %{python_module nose}
 BuildRequires:  fdupes
-BuildRequires:  python-rpm-macros
+BuildRequires:  python-devel
+BuildRequires:  python-nose
 # Tests will use this package
 BuildRequires:  timezone
 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()")}
+%else
 BuildArch:      noarch
-
-%ifpython2
-Provides:       %{oldpython}-tz = 2014b
-Obsoletes:      %{oldpython}-tz < 2014b
 %endif
 
-%python_subpackages
+Provides:       python-tz = 2014b
+Obsoletes:      python-tz < 2014b
 
 %description
 pytz - World Timezone Definitions for Python
@@ -71,20 +68,20 @@ Amost all of the Olson timezones are supported.
 sed -i '/^#!/d' ./pytz/tzfile.py
 
 %build
-%python_build
+python setup.py build
 
 %install
-%python_install
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 # Remove the pytz zoneinfo only if we use the system tz database
 %if 0%{?suse_version} >= 1310
 rm -fr %{buildroot}%{python_sitelib}/pytz/zoneinfo
 %endif
-%{python_expand %fdupes %{buildroot}%{$python_sitelib}}
+%fdupes %{buildroot}%{python_sitelib}
 
 %check
-%python_expand nosetests-%{$python_bin_suffix}
+nosetests
 
-%files %{python_files}
+%files
 %defattr(-,root,root,-)
 %doc LICENSE.txt README.txt
 %{python_sitelib}/*