[pygrib] update setup patch file to new version 1.9.9

[Jos de Kloe]

commit c0e0fb265d9d52b8f0c83bc58e7ed8144a2bbb9a
Author: Jos de Kloe <josdekloe at gmail.com>
Date:   Sat Jul 5 21:00:47 2014 +0200

    update setup patch file to new version 1.9.9

 pygrib-1.9.9-build.patch |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)
---
diff --git a/pygrib-1.9.9-build.patch b/pygrib-1.9.9-build.patch
index 15a1d42..3e8d2f5 100644
--- a/pygrib-1.9.9-build.patch
+++ b/pygrib-1.9.9-build.patch
@@ -1,6 +1,6 @@
---- setup.py.orig	2013-10-21 21:25:20.000000000 +0200
-+++ setup.py	2013-10-26 17:40:53.258402110 +0200
-@@ -101,23 +101,33 @@
+--- setup.py.orig	2014-07-05 17:32:15.707423717 +0200
++++ setup.py	2014-07-05 17:32:44.165661845 +0200
+@@ -105,23 +105,33 @@
  if zlib_incdir is None and zlib_dir is not None:
      incdirs.append(os.path.join(zlib_dir,'include'))
  
@@ -49,7 +49,7 @@
  
  if hasattr(sys,'maxsize'):
      if sys.maxsize > 2**31-1: macros.append(('__64BIT__',1))
-@@ -125,13 +135,18 @@
+@@ -129,12 +139,12 @@
      if sys.maxint > 2**31-1: macros.append(('__64BIT__',1))
  
  g2clibext = Extension("g2clib",g2clib_deps,include_dirs=incdirs,\
@@ -63,15 +63,25 @@
 +Extension("pygrib",["pygrib.c"],include_dirs=incdirs,library_dirs=libdirs,
 +          libraries=libraries)
  
-+# don't provide the scripts for the python3 version, to prevent collisions
-+# in case a user installs both a python2 and a python3 version of the module
+ # man pages installed in man_dir/man1
+ if man_dir is not None:
+@@ -145,6 +155,15 @@
+     data_files = None
+ 
+ 
++# don't provide the scripts and man pages for the python3 version,
++# to prevent rpm ownership collisions in case a user installs both
++# a python2 and a python3 version of the module
 +scripts_list = []
 +if sys.version_info[0] < 3:
-+    scripts_list = ['utils/grib_list','utils/grib_repack','utils/cnvgrib1to2','utils/cnvgrib2to1']
++    scripts_list = ['utils/grib_list','utils/grib_repack',
++                    'utils/cnvgrib1to2','utils/cnvgrib2to1']
++if sys.version_info[0] >= 3:
++    data_files = None
  
  setup(name = "pygrib",
-       version = "1.9.7",
-@@ -140,7 +155,6 @@
+       version = "1.9.9",
+@@ -153,8 +172,7 @@
        author_email      = "jeffrey.s.whitaker at noaa.gov",
        url               = "http://code.google.com/p/pygrib",
        download_url      = "http://code.google.com/p/pygrib/downloads/list",
@@ -79,4 +89,5 @@
 -      ['utils/grib_list','utils/grib_repack','utils/cnvgrib1to2','utils/cnvgrib2to1'],
 +      scripts           = scripts_list,
        ext_modules       = [pygribext,g2clibext,redtoregext],
-       py_modules        = ["ncepgrib2"])
+       py_modules        = ["ncepgrib2"],
+       data_files        = data_files)