[python-upoints] * Fri May 11 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.11.0-8 - Minor changes

[Fabian Affolter]

commit 97cb8d20040ad9d1578c32e72e57136f7d931d4d
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri May 11 12:38:33 2012 +0200

    * Fri May 11 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.11.0-8
    - Minor changes

 python-upoints.spec |   31 ++++++++++++++-----------------
 1 files changed, 14 insertions(+), 17 deletions(-)
---
diff --git a/python-upoints.spec b/python-upoints.spec
index d2c90c0..b84954c 100644
--- a/python-upoints.spec
+++ b/python-upoints.spec
@@ -1,23 +1,22 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%global srcname upoints
 
 Name:           python-upoints
 Version:        0.11.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Python modules for working with points on Earth
 
 Group:          Applications/Engineering
 License:        GPLv3+
 URL:            http://www.jnrowe.ukfsn.org/projects/upoints.html
-Source0:        http://www.jnrowe.ukfsn.org/data/upoints-%{version}.tar.bz2
+Source0:        http://www.jnrowe.ukfsn.org/data/%{srcname}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python
-BuildRequires:  python-setuptools-devel
+BuildRequires:  python2-devel
+BuildRequires:  python-setuptools
 
 Requires:       python-lxml
 
-
 %description
 upoints, previously called earth_distance, is a collection of
 modules for working with points on a spherical object. It allows
@@ -25,35 +24,33 @@ you to calculate the distance and bearings between points,
 mangle xearth/xplanet data files, work with online UK trigpoint 
 databases and various other databases.
 
-
 %prep
-%setup -q -n upoints-%{version}
+%setup -q -n %{srcname}-%{version}
 chmod -x test/grab_net_sources.py
 sed -i 's/\r$//' test/data/gpsdata
 
 %build
 python setup.py build
 
-
 %install
 rm -rf %{buildroot}
 python setup.py install -O1 --skip-build --root=%{buildroot}
 mv %{buildroot}%{_bindir}/edist.py %{buildroot}/%{_bindir}/edist
 
-
 %clean
 rm -rf %{buildroot}
 
-
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING NEWS README doc/ html/ test/
 %{_bindir}/edist
-%{python_sitelib}/upoints/
-%{python_sitelib}/upoints*.egg-info
-
+%{python_sitelib}/%{srcname}/
+%{python_sitelib}/%{srcname}*.egg-info
 
 %changelog
+* Fri May 11 2012 Fabian Affolter <mail at fabian-affolter.ch> - 0.11.0-8
+- Minor changes 
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
@@ -66,11 +63,11 @@ rm -rf %{buildroot}
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
-* Mon Apr 28 2009 Fabian Affolter <fabian at bernewireless.net> - 0.11.0-3
+* Mon Apr 28 2009 Fabian Affolter <mail at fabian-affolter.ch> - 0.11.0-3
 - Changed define to global 
 
-* Fri Apr 18 2009 Fabian Affolter <fabian at bernewireless.net> - 0.11.0-2
+* Fri Apr 18 2009 Fabian Affolter <mail at fabian-affolter.ch> - 0.11.0-2
 - Removed ./
 
-* Sat Apr 11 2009 Fabian Affolter <fabian at bernewireless.net> - 0.11.0-1
+* Sat Apr 11 2009 Fabian Affolter <mail at fabian-affolter.ch> - 0.11.0-1
 - Initial spec for Fedora