From 4d7e4a9f017bb61c1978d5820d25f6adb3316aaa Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Sun, 10 Jan 2016 23:21:09 +0100 Subject: [PATCH] New upstream (1.1.1) --- .gitignore | 1 + python-astropy.spec | 39 +++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index ce6fdc9..d88d566 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /astropy-1.0.4.tar.gz /astropy-1.0.5.tar.gz /astropy-1.0.6.tar.gz +/astropy-1.1.1.tar.gz diff --git a/python-astropy.spec b/python-astropy.spec index 43ff834..845f86a 100644 --- a/python-astropy.spec +++ b/python-astropy.spec @@ -1,16 +1,16 @@ %if 0%{?fedora} %global with_python3 1 %endif -%global upname astropy +%global srcname astropy Name: python-astropy -Version: 1.1 -Release: 1.post2%{?dist} +Version: 1.1.1 +Release: 1%{?dist} Summary: A Community Python Library for Astronomy License: BSD URL: http://astropy.org -Source0: http://pypi.python.org/packages/source/a/astropy/astropy-%{version}.post2.tar.gz +Source0: http://pypi.python.org/packages/source/a/astropy/astropy-%{version}.tar.gz Source1: astropy-README.dist Source2: astropy-ply.py Patch0: python-astropy-system-configobj.patch @@ -40,7 +40,7 @@ Requires: PyYAML Requires: /usr/bin/xmllint Provides: bundled(jquery) = 1.11 -Provides: python2-%{upname} = %{version}-%{release} +Provides: python2-%{srcname} = %{version}-%{release} %description The Astropy project is a common effort to develop a single core package @@ -51,7 +51,7 @@ functionality, as well as frameworks for cosmology, unit handling, and coordinate transformations. %package doc -Provides: python2-%{upname}-doc = %{version}-%{release} +Provides: python2-%{srcname}-doc = %{version}-%{release} Summary: Documentation for %{name}, includes full API docs # Disabled for the moment to avoid name collision # of generated names between arches @@ -61,7 +61,7 @@ Summary: Documentation for %{name}, includes full API docs This package contains the full API documentation for %{name}. %if 0%{?with_python3} -%package -n python3-%{upname} +%package -n python3-%{srcname} Summary: A Community Python Library for Astronomy BuildRequires: python3-devel python3-setuptools python3-numpy BuildRequires: git python3-Cython python3-pytest python3-six python3-ply @@ -91,7 +91,7 @@ Requires: /usr/bin/xmllint Provides: bundled(jquery) = 1.11 -%description -n python3-%{upname} +%description -n python3-%{srcname} The Astropy project is a common effort to develop a single core package for Astronomy. Major packages such as PyFITS, PyWCS, vo, and asciitable already merged in, and many more components being worked on. In @@ -99,34 +99,34 @@ particular, we are developing imaging, photometric, and spectroscopic functionality, as well as frameworks for cosmology, unit handling, and coordinate transformations. -%package -n python3-%{upname}-doc +%package -n python3-%{srcname}-doc Summary: Documentation for %{name}, includes full API docs # Disabled for the moment to avoid name collision # of generated names between arches # BuildArch: noarch -%description -n python3-%{upname}-doc +%description -n python3-%{srcname}-doc This package contains the full API documentation for %{name}. %endif # with_python3 -%package -n %{upname}-tools +%package -n %{srcname}-tools Summary: Astropy utility tools BuildArch: noarch %if 0%{?fedora} >= 22 -Requires: python3-%{upname} = %{version}-%{release} +Requires: python3-%{srcname} = %{version}-%{release} Obsoletes: pyfits-tools < 3.3-6 Provides: pyfits-tools = %{version}-%{release} %else -Requires: python-%{upname} = %{version}-%{release} +Requires: python-%{srcname} = %{version}-%{release} %endif -%description -n %{upname}-tools +%description -n %{srcname}-tools Utilities provided by Astropy %prep -%setup -qn %{upname}-%{version}.post2 +%setup -qn %{srcname}-%{version} cp %{SOURCE1} README.dist # Required to support wcslib 4.5 find -name wcsconfig.h -delete @@ -212,7 +212,7 @@ popd %license licenses/LICENSE.rst %{python2_sitearch}/* -%files -n %{upname}-tools +%files -n %{srcname}-tools %{_bindir}/* %if 0%{?fedora} < 22 # These two are provided by pyfits @@ -225,18 +225,21 @@ popd %license licenses/LICENSE.rst %if 0%{?with_python3} -%files -n python3-%{upname} +%files -n python3-%{srcname} %doc README.rst README.dist %license licenses/LICENSE.rst %{python3_sitearch}/* -%files -n python3-%{upname}-doc +%files -n python3-%{srcname}-doc %doc README.rst README.dist docs/_build/html %license licenses/LICENSE.rst %endif # with_python3 %changelog +* Sun Jan 10 2016 Sergio Pascual - 1.1.1-1 +- New upstream (1.1.1) + * Wed Jan 06 2016 Sergio Pascual - 1.1-1.post2 - New upstream (1.1.post2) diff --git a/sources b/sources index f7b0594..2bbfcca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9317a9b9c52bef92e1afe132aa412d36 astropy-1.1.post2.tar.gz +03a6a9189fc0ce58862540c974bc17e8 astropy-1.1.1.tar.gz