[pygrib] update to version 1.9.9 and new source location

[Jos de Kloe]

commit 38c80dda48be2d6deead5f3403f73173c32a2016
Author: Jos de Kloe <josdekloe at gmail.com>
Date:   Sat Jul 5 20:49:01 2014 +0200

    update to version 1.9.9 and new source location

 ...b-1.9.7-build.patch => pygrib-1.9.9-build.patch |    0
 ...clib.pyx.patch => pygrib-1.9.9-g2clib.pyx.patch |    0
 pygrib.spec                                        |   40 +++++++++++++------
 3 files changed, 27 insertions(+), 13 deletions(-)
---
diff --git a/pygrib-1.9.7-build.patch b/pygrib-1.9.9-build.patch
similarity index 100%
rename from pygrib-1.9.7-build.patch
rename to pygrib-1.9.9-build.patch
diff --git a/pygrib-1.9.7-g2clib.pyx.patch b/pygrib-1.9.9-g2clib.pyx.patch
similarity index 100%
rename from pygrib-1.9.7-g2clib.pyx.patch
rename to pygrib-1.9.9-g2clib.pyx.patch
diff --git a/pygrib.spec b/pygrib.spec
index 9b143e7..8854bd0 100644
--- a/pygrib.spec
+++ b/pygrib.spec
@@ -4,14 +4,14 @@
 %endif
 
 Name:       pygrib
-Version:    1.9.7
-Release:    3%{?dist}
+Version:    1.9.9
+Release:    1%{?dist}
 Summary:    Python module for reading and writing GRIB (editions 1 and 2) files
 
 License:    MIT
 Group:      Applications/Engineering
 URL:        http://code.google.com/p/pygrib/
-Source0:    http://pygrib.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:    https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
 
 # Adapt setup.py to not use packaged g2clib source code
 # and fix a small python3 problem
@@ -57,16 +57,13 @@ BuildRequires:  python3-pyproj
 Requires:  grib_api
 
 Requires:  pyproj
-%if 0%{?with_python3}
-Requires:  python3-pyproj
-%endif # if with_python3
 
 # specifying this is not needed. rpmbuild figures it out without help
 # Requires: pyproj jasper-libs openjpeg-libs libpng zlib
 
 # avoid providing the private libs:
 %{?filter_setup:
-%filter_provides_in %{python_sitearch}.*\.so$
+%filter_provides_in %{python2_sitearch}.*\.so$
 %filter_setup
 }
 
@@ -98,8 +95,9 @@ distributing gridded data. This module contains python interfaces for reading
 and writing GRIB data using the ECMWF GRIB API C library, and the NCEP GRIB2 
 C library, as well as command-line utilities for listing and re-packing GRIB 
 files.
-%endif # if with_python3
 
+Requires:  python3-pyproj
+%endif # if with_python3
 
 %prep
 %setup -q
@@ -150,10 +148,14 @@ pushd %{py3dir}
 %endif # if with_python3
 
 %install
+
+# this setting triggers installation of man pages by the setup.py file
+export MAN_DIR=/usr/share/man/
+
 %{__python2} setup.py install --skip-build --root %{buildroot}
 
 # correct wrong write permission for group
-chmod 755  %{buildroot}/%{python_sitearch}/*.so
+chmod 755  %{buildroot}/%{python2_sitearch}/*.so
 
 %if 0%{?with_python3}
 pushd %{py3dir}
@@ -164,7 +166,7 @@ chmod 755  %{buildroot}/%{python3_sitearch}/*.so
 %endif # if with_python3
 
 %check
-export PYTHONPATH=%{buildroot}/%{python_sitearch}
+export PYTHONPATH=%{buildroot}/%{python2_sitearch}
 %{__python2} test.py
 
 %if 0%{?with_python3}
@@ -178,11 +180,13 @@ export PYTHONPATH=%{buildroot}/%{python3_sitearch}
 %doc docs ncepgrib2_docs
 
 # For arch-specific packages: sitearch
-%{python_sitearch}/*.so
-%{python_sitearch}/ncep*.py*
-%{python_sitearch}/%{name}-*-py*.egg-info
+%{python2_sitearch}/*.so
+%{python2_sitearch}/ncep*.py*
+%{python2_sitearch}/%{name}-*-py*.egg-info
 %{_bindir}/cnv*
 %{_bindir}/grib_*
+%{_mandir}/man1/cnv*
+%{_mandir}/man1/grib_*
 
 %if 0%{?with_python3}
 %files -n python3-%{name}
@@ -195,9 +199,19 @@ export PYTHONPATH=%{buildroot}/%{python3_sitearch}
 # these are only provided for python2 for now
 #%%{_bindir}/cnv*
 #%%{_bindir}/grib_*
+#%%{_mandir}/man1/cnv*
+#%%{_mandir}/man1/grib_*
+
 %endif # with_python3
 
 %changelog
+* Sat Jul 05 2014 Jos de Kloe <josdekloe at gmail.com> 1.9.9-1
+- update to upstream version 1.9.9
+- replace python_sitearch macro with python2_sitearch
+- activate installation of the newly added man pages
+- fix requires problem for python3-pyproj
+- update url for Source0
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild