- updated to 4.4.0 (note: f77+f90 now obligatory, f2003 optional)

- updated f90 patch
- removed outdated info patch (texinfo docs dropped upstream)

diff --git a/netcdf-fortran-f90.patch b/netcdf-fortran-f90.patch
index 7d7b75800d2788b26dd8c6dade795464eb37b4f5..5d51a862ec983a0be7f31568692d0432d058a853 100644 (file)
--- a/netcdf-fortran-f90.patch
+++ b/netcdf-fortran-f90.patch
@@ -1,5 +1,5 @@
---- netcdf-fortran-4.2/f90/netcdf_visibility.f90.orig  2011-09-27 16:17:02.000000000 +0200
-+++ netcdf-fortran-4.2/f90/netcdf_visibility.f90       2012-03-20 16:03:11.006184197 +0100
+--- netcdf-fortran-4.2/fortran/netcdf_visibility.f90.orig      2011-09-27 16:17:02.000000000 +0200
++++ netcdf-fortran-4.2/fortran/netcdf_visibility.f90   2012-03-20 16:03:11.006184197 +0100
 @@ -20,6 +20,6 @@
    public :: nf90_put_att, nf90_get_att
    

diff --git a/netcdf-fortran-info.patch b/netcdf-fortran-info.patch
deleted file mode 100644 (file)
index 4c36d7b..0000000
--- a/netcdf-fortran-info.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- netcdf-4.0.1/man4/netcdf-f77.texi.orig     2008-01-29 19:22:51.000000000 +0100
-+++ netcdf-4.0.1/man4/netcdf-f77.texi  2008-11-01 12:42:21.152734968 +0100
-@@ -16,9 +16,9 @@
- @include defines.texi
- 
- @ifinfo
--@dircategory netCDF scientific data format
-+@dircategory Libraries:
- @direntry
--* netcdf-f77: (netcdf-f77).         @value{f77-man}
-+* netcdf-f77: (netcdf-f77).           @value{f77-man}
- @end direntry
- @end ifinfo
- 
---- netcdf-4.0.1/man4/netcdf-f90.texi.orig     2008-01-29 19:22:52.000000000 +0100
-+++ netcdf-4.0.1/man4/netcdf-f90.texi  2008-11-01 12:42:32.452735806 +0100
-@@ -16,9 +16,9 @@
- @include defines.texi
- 
- @ifinfo
--@dircategory netCDF scientific data format
-+@dircategory Libraries:
- @direntry
--* netcdf-f90: (netcdf-f90).         @value{f90-man}
-+* netcdf-f90: (netcdf-f90).           @value{f90-man}
- @end direntry
- @end ifinfo
- 

diff --git a/netcdf-fortran.spec b/netcdf-fortran.spec
index 95f6e716d594669999ea71074aa358f1fdd607fa..6a4d79eb9c9d3add8f19fdaa8ea298c7257a728c 100644 (file)
--- a/netcdf-fortran.spec
+++ b/netcdf-fortran.spec
@@ -1,27 +1,26 @@
 #
 # Conditional build:
-%bcond_without f90             # don't build Fortran 90 interface (just builtin F77)
+%bcond_without f2003           # don't build Fortran 2003 interface (just F77/F90)
 %bcond_without tests           # don't perform "make check"
                                # (note: tests need endoder-enabled szip)
 #
 Summary:       NetCDF Fortran library
 Summary(pl.UTF-8):     Biblioteka NetCDF dla języka Fortran
 Name:          netcdf-fortran
-Version:       4.2
+Version:       4.4.0
 Release:       1
 License:       BSD-like
 Group:         Libraries
 Source0:       ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-%{version}.tar.gz
-# Source0-md5: cc3bf530223e8f4aff93793b9f197bf3
+# Source0-md5: 258fac4fe522be5945d84bf4a4b3b837
 Patch0:                %{name}-f90.patch
-Patch1:                %{name}-info.patch
 URL:           http://www.unidata.ucar.edu/packages/netcdf/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
-%if %{with f90}
-BuildRequires: gcc-fortran >= 5:4.0
+%if %{with f2003}
+BuildRequires: gcc-fortran >= 6:4.4
 %else
-BuildRequires: gcc-g77
+BuildRequires: gcc-fortran >= 5:4.0
 %endif
 BuildRequires: libtool >= 2:2.2
 BuildRequires: netcdf-devel >= 4.2
@@ -55,10 +54,10 @@ Summary:    Header files for netCDF Fortran interface
 Summary(pl.UTF-8):     Pliki nagłówkowe interfejsu netCDF dla języka Fortran
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-%if %{with f90}
-Requires:      gcc-fortran >= 5:4.0
+%if %{with f2003}
+Requires:      gcc-fortran >= 6:4.4
 %else
-Requires:      gcc-g77
+Requires:      gcc-fortran >= 5:4.0
 %endif
 Requires:      netcdf-devel >= 4.2
 Obsoletes:     netcdf-f90-devel
@@ -85,7 +84,6 @@ Statyczna wersja biblioteki netCDF dla języka Fortran.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -97,7 +95,7 @@ Statyczna wersja biblioteki netCDF dla języka Fortran.
 CPPFLAGS="%{rpmcppflags} -DgFortran=1"
 %configure \
        FCFLAGS="%{rpmcflags}" \
-       %{!?with_f90:--disable-f90}
+       %{!?with_f2003:--disable-f03}
 
 %{__make}
 
@@ -111,6 +109,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnetcdff.la
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -125,26 +126,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYRIGHT README
+%doc COPYRIGHT README.md RELEASE_NOTES.md
 %attr(755,root,root) %{_libdir}/libnetcdff.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnetcdff.so.5
+%attr(755,root,root) %ghost %{_libdir}/libnetcdff.so.6
 
 %files devel
 %defattr(644,root,root,755)
-%doc man4/netcdf-f77.html man4/netcdf-f90.html
 %attr(755,root,root) %{_bindir}/nf-config
 %attr(755,root,root) %{_libdir}/libnetcdff.so
-%{_libdir}/libnetcdff.la
 %{_includedir}/netcdf.inc
-%{_pkgconfigdir}/netcdf-fortran.pc
-%{_mandir}/man3/netcdf_f77.3*
-%{_infodir}/netcdf-f77.info*
-%if %{with f90}
-%{_includedir}/netcdf.mod
+%{_includedir}/netcdf*.mod
 %{_includedir}/typesizes.mod
-%{_mandir}/man3/netcdf_f90.3*
-%{_infodir}/netcdf-f90.info*
-%endif
+%{_pkgconfigdir}/netcdf-fortran.pc
+%{_mandir}/man3/netcdf_fortran.3*
 
 %files static
 %defattr(644,root,root,755)