From 55c187dc2dc8eedece71ad34e1ff09ee6a94c730 Mon Sep 17 00:00:00 2001
From: Sergio Pascual <sergiopr@fis.ucm.es>
Date: Jul 09 2014 12:13:40 +0000
Subject: Updated to new version


- Run tests on installed version
- Use python2 macros

---

diff --git a/.gitignore b/.gitignore
index 331a741..f8cec5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /APLpy-0.9.6.tar.gz
 /APLpy-0.9.8.tar.gz
+/APLpy-0.9.11.tar.gz
diff --git a/APLpy.spec b/APLpy.spec
index 5bdcb30..419a1e0 100644
--- a/APLpy.spec
+++ b/APLpy.spec
@@ -1,18 +1,19 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           APLpy
-Version:        0.9.8
-Release:        5%{?dist}
+Version:        0.9.11
+Release:        1%{?dist}
 Summary:        The Astronomical Plotting Library in Python
 
 Group:          Development/Languages
 License:        MIT
 URL:            http://aplpy.github.com
-Source0:        https://github.com/downloads/%{name}/%{name}/%{name}-%{version}.tar.gz
+Source0:        https://pypi.python.org/packages/source/A/%{name}/%{name}-%{version}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  python-devel numpy python-matplotlib pyfits pywcs
-Requires:       numpy python-matplotlib pyfits pywcs
+BuildRequires:  python2-devel numpy python-matplotlib python-astropy
+BuildRequires:  python-matplotlib-tk pytest
+Requires:       numpy python-matplotlib python-astropy
 
 %description
 APLpy (the Astronomical Plotting Library in Python) is a Python module aimed at 
@@ -41,20 +42,31 @@ o Save plots as EPS, PDF, PS, PNG, and SVG
 %setup -q -n %{name}-%{version}
 
 %build
-%{__python} setup.py build
-
-%check
-%{__python} setup.py test
+%{__python2} setup.py build
 
 %install
-%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%{__python2} setup.py install -O1 --skip-build --root %{buildroot}
+
+%check
+# Fake matplotlibrc
+mkdir matplotlib
+touch matplotlib/matplotlibrc
+export XDG_CONFIG_HOME=`pwd`
+pushd %{buildroot}/%{python2_sitelib}
+py.test-%{python2_version} aplpy
+popd
 
 %files
-%doc CHANGES LICENSE README runtests.py tests/
-%{python_sitelib}/%{name}-%{version}-py2.7.egg-info
-%{python_sitelib}/aplpy/
+%doc CHANGES.rst LICENSE.rst README.rst
+%{python2_sitelib}/%{name}-%{version}-py2.7.egg-info
+%{python2_sitelib}/aplpy/
 
 %changelog
+* Tue Jul 08 2014 Sergio Pascual <sergiopr@fedoraproject.org> - 0.9.11-1
+- Updated to new version
+- Run tests on installed version
+- Use python2 macros
+
 * Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -67,7 +79,7 @@ o Save plots as EPS, PDF, PS, PNG, and SVG
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.8-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Tue May 03 2012 Germán A. Racca <skytux@fedoraproject.org> - 0.9.8-1
+* Thu May 03 2012 Germán A. Racca <skytux@fedoraproject.org> - 0.9.8-1
 - Updated to new version
 - Included tests in %%check and corresponding BRs
 - Packaged tests in %%doc section
diff --git a/sources b/sources
index 598f4e7..99459ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a93848f72951e3114c5b7a618750ca82  APLpy-0.9.8.tar.gz
+53a2130136dd6e0b2fbf1c8e8b15d3e6  APLpy-0.9.11.tar.gz