[grib_api: 1/2] Update to 1.9.9, fixup directory ownership

[Orion Poplawski]

commit 7138a51e41c0028a2f3f566219afada06021631f
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Jan 13 09:33:28 2012 -0700

    Update to 1.9.9, fixup directory ownership

 grib_api-paths.patch |   20 ++++++++++++++++++++
 grib_api.spec        |   13 +++++++------
 2 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/grib_api-paths.patch b/grib_api-paths.patch
new file mode 100644
index 0000000..21514e6
--- /dev/null
+++ b/grib_api-paths.patch
@@ -0,0 +1,20 @@
+diff -up grib_api-1.9.9_libtool/configure.paths grib_api-1.9.9_libtool/configure
+--- grib_api-1.9.9_libtool/configure.paths	2011-03-21 07:45:19.000000000 -0600
++++ grib_api-1.9.9_libtool/configure	2012-01-12 15:46:33.614270171 -0700
+@@ -11568,13 +11568,13 @@ default_perl_install='${prefix}/perl'
+ 
+ 
+ if test "$prefix" != 'NONE' ; then
+-  definition_files_path=${prefix}/share/definitions
+-  samples_files_path=${prefix}/share/samples
++  definition_files_path=${prefix}/share/grib_api/definitions
++  samples_files_path=${prefix}/share/grib_api/samples
+   default_perl_install=${prefix}/perl
+ fi
+ 
+ if test "$datadir" != '${datarootdir}' ; then
+-   definition_files_path=$datadir/definitions
++   definition_files_path=$datadir/grib_api/definitions
+ fi
+ 
+ 
diff --git a/grib_api.spec b/grib_api.spec
index ffddb54..5f38687 100644
--- a/grib_api.spec
+++ b/grib_api.spec
@@ -1,12 +1,13 @@
 Name:           grib_api
-Version:        1.7.0
-Release:        6%{?dist}
+Version:        1.9.9
+Release:        1%{?dist}
 Summary:        WMO FM-92 GRIB (v1,v2) interface accessible from C and FORTRAN programs
 
 Group:          Applications/System
 License:        LGPLv3
 URL:            http://www.ecmwf.int/products/data/software/grib_api.html
 Source0:        http://www.ecmwf.int/products/data/software/download/software_files/%{name}-%{version}.tar.gz
+Patch0:         grib_api-paths.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  jasper-devel
@@ -37,13 +38,14 @@ Static libraries for %{name}
 
 %prep
 %setup -q
+%patch0 -p1 -b .paths
 
 
 %build
 %ifarch x86_64
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 %endif
-%{configure}
+%{configure} --with-ifs-samples=%{_datadir}/%{name}/ifs_samples
 make %{?_smp_mflags}
 
 
@@ -67,14 +69,13 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
-%doc %{_datadir}/%{name}/samples/
-%doc %{_datadir}/%{name}/definitions/
+%doc %{_datadir}/%{name}/
 %{_bindir}/*
 
 %files devel
 %defattr(-,root,root,-)
 %doc INSTALL README LICENSE COPYING.LESSER ChangeLog AUTHORS gpl-3.0.txt
-%{_prefix}/include/*
+%{_includedir}/*
 
 %files static
 %defattr(-,root,root,-)