[pyproj] update to version 1.9.4
Jos de Kloe
jdekloe at fedoraproject.org
Thu Mar 12 19:47:10 UTC 2015
commit ff7206eaa17157cb8aa4ca3b67f1a5506aff5d21
Author: Jos de Kloe <josdekloe at gmail.com>
Date: Thu Mar 12 20:46:20 2015 +0100
update to version 1.9.4
pyproj.spec | 75 ++++++++++++++++++++++++++++++++-----------------------------
1 file changed, 39 insertions(+), 36 deletions(-)
---
diff --git a/pyproj.spec b/pyproj.spec
index 3dd33d1..d91ab31 100644
--- a/pyproj.spec
+++ b/pyproj.spec
@@ -1,32 +1,23 @@
-# This module also works with Python 3
%if 0%{?fedora} || 0%{?rhel} > 6
%global with_python3 1
%endif
-%global svn 20120712svn300
-
Name: pyproj
-Version: 1.9.2
-Release: 11.%{svn}%{?dist}
+Version: 1.9.4
+Release: 1%{?dist}
Summary: Cython wrapper to provide python interfaces to Proj
Group: Development/Libraries
License: MIT
-URL: http://code.google.com/p/%{name}
-#Source0: http://%%{name}.googlecode.com/files/%%{name}-%%{version}.tar.gz
-
-# The source for this package was pulled from upstream's vcs. Use the
-# following commands to generate the tarball:
-# svn export -r 300 http://pyproj.googlecode.com/svn/trunk/ pyproj-1.9.2
-# tar -zcvf pyproj-1.9.2-20120712svn300.tar.gz pyproj-1.9.2
-Source0: %{name}-%{version}-%{svn}.tar.gz
+URL: https://github.com/jswhit/%{name}
+Source0: https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
BuildRequires: python2-devel
#to test if this can be removed, it seems obsolete/unneccessary
#BuildRequires: python-setuptools
BuildRequires: numpy
BuildRequires: Cython
-BuildRequires: proj-devel >= 4.8.0
+BuildRequires: proj-devel
%if 0%{?with_python3}
BuildRequires: python3-devel
#to test if this can be removed, it seems obsolete/unneccessary
@@ -39,7 +30,7 @@ Requires: proj-epsg
# avoid providing the private libs:
%{?filter_setup:
-%filter_provides_in %{python_sitearch}.*\.so$
+%filter_provides_in %{python2_sitearch}.*\.so$
%filter_setup
}
@@ -97,6 +88,7 @@ cython _proj.pyx
%if 0%{?with_python3}
pushd %{py3dir}
cython -3 _proj.pyx
+popd
%endif # if with_python3
%build
@@ -106,13 +98,14 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup-proj.py build
%if 0%{?with_python3}
pushd %{py3dir}
CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup-proj.py build
+popd
%endif # if with_python3
%install
%{__python2} setup-proj.py install --skip-build --root %{buildroot}
# correct wrong write permission for group
-chmod 755 %{buildroot}/%{python_sitearch}/%{name}/*.so
+chmod 755 %{buildroot}/%{python2_sitearch}/%{name}/*.so
%if 0%{?with_python3}
pushd %{py3dir}
@@ -121,42 +114,52 @@ pushd %{py3dir}
# correct wrong write permission for group
chmod 755 %{buildroot}/%{python3_sitearch}/%{name}/*.so
+popd
%endif # if with_python3
-#%%check
-# note: the test() function is automatically called if the
-# __init__.py file is run as main script.
-# However, the tests require functionality implemented in proj4
-# after version 4.8 was released, so activating this is postponed
-# untill proj4 version 4.9 is available.
+%check
+
+# note1: the test() function is automatically called if the
+# __init__.py file is run as main script, but Icould not yet figure out
+# how to do this in this spec file, so just manually call the test() function.
+
+# note2: the current version shows a fair number of failures in the test suite.
+# Out of 73 tests the overall score was 54 passed and 19 failed.
+# This has been reported upstream here:
+# https://github.com/jswhit/pyproj/issues/6
+
+#%%{__python2} -c 'import pyproj;pyproj.test()'
+PYTHONPATH="%{buildroot}%{python2_sitearch}" %{__python2} -c 'import pyproj;pyproj.test()'
+%if 0%{?with_python3}
+pushd %{py3dir}
+PYTHONPATH="%{buildroot}%{python3_sitearch}" %{__python3} -c 'import pyproj;pyproj.test()'
+popd
+%endif # if with_python3
%files
-%doc Changelog docs README
-%{python_sitearch}/%{name}
-%{python_sitearch}/%{name}-*-py*.egg-info
+%doc Changelog docs README.md
+%{python2_sitearch}/%{name}
+%{python2_sitearch}/%{name}-*-py*.egg-info
# note: the provided create_docs.sh script would suggest that
# epydoc is needed to build the docs in subdir docs. However
# the upstream author has already run this tool and has added
-# the resulting files to svn, so this is not needed anymore during
-# rpm creation.
+# the resulting files to svn, so this is not needed during
+# rpm creation after all.
%if 0%{?with_python3}
%files -n python3-%{name}
-%doc Changelog docs README
+%doc Changelog docs README.md
%{python3_sitearch}/%{name}
%{python3_sitearch}/%{name}-*-py*.egg-info
%endif # with_python3
%changelog
-* Sun Aug 17 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.2-11.20120712svn300
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.2-10.20120712svn300
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon May 19 2014 Bohuslav Kabrda <bkabrda at redhat.com> - 1.9.2-9.20120712svn300
-- Rebuilt for https://fedoraproject.org/wiki/Changes/Python_3.4
+* Thu Mar 12 2015 Jos de Kloe <josdekloe at gmail.com> 1.9.4-1
+- update to version 1.9.4
+- replace python_sitearch macro with python2_sitearch
+- replace the deprecated macro __python by __python3
+- activate the check section
* Sat Jan 11 2014 Jos de Kloe <josdekloe at gmail.com> 1.9.2-8.20120712svn300
- replace the deprecated macro __python by __python2
More information about the scm-commits
mailing list