packages: netcdf/netcdf.spec, netcdf/netcdf-link.patch (NEW) - updated to 4...

[qboosh]

Author: qboosh                       Date: Wed May  4 18:11:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 4.1.2 (note: new libnetcdf,libnetcdf_c++ sonames)
- added link patch

---- Files affected:
packages/netcdf:
   netcdf.spec (1.35 -> 1.36) , netcdf-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/netcdf/netcdf.spec
diff -u packages/netcdf/netcdf.spec:1.35 packages/netcdf/netcdf.spec:1.36
--- packages/netcdf/netcdf.spec:1.35	Sat Feb  5 00:36:52 2011
+++ packages/netcdf/netcdf.spec	Wed May  4 20:11:48 2011
@@ -7,14 +7,16 @@
 Summary:	NetCDF: Network Common Data Form
 Summary(pl.UTF-8):	NetCDF: obsługa wspólnego sieciowego formatu danych
 Name:		netcdf
-Version:	4.1.1
+Version:	4.1.2
 Release:	1
 License:	BSD-like
 Group:		Libraries
 Source0:	ftp://ftp.unidata.ucar.edu/pub/netcdf/%{name}-%{version}.tar.gz
-# Source0-md5:	79c5ff14c80d5e18dd8f1fceeae1c8e1
+# Source0-md5:	4a94ebe2d998d649159aa5665c83fb1a
 Patch0:		%{name}-info.patch
+Patch1:		%{name}-link.patch
 URL:		http://www.unidata.ucar.edu/packages/netcdf/
+BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	curl-devel
 %if %{with f90}
@@ -24,7 +26,7 @@
 %endif
 BuildRequires:	hdf5-devel >= 1.8.5
 BuildRequires:	libstdc++-devel
-BuildRequires:	libtool >= 2:1.5
+BuildRequires:	libtool >= 2:2.4
 BuildRequires:	texinfo
 Requires:	hdf5 >= 1.8.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -161,11 +163,28 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-# too many hacks to rebuild
-cp -f /usr/share/automake/config.* .
-CPPFLAGS="-DgFortran=1"
+cd udunits
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../libcf
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ..
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+CPPFLAGS="%{rpmcppflags} -DgFortran=1"
 %configure \
 	FCFLAGS="%{rpmcflags}" \
 	--enable-dap \
@@ -184,8 +203,6 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/netcdf
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -224,7 +241,7 @@
 %attr(755,root,root) %{_bindir}/ncgen
 %attr(755,root,root) %{_bindir}/ncgen3
 %attr(755,root,root) %{_libdir}/libnetcdf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnetcdf.so.6
+%attr(755,root,root) %ghost %{_libdir}/libnetcdf.so.7
 %{_mandir}/man1/nccopy.1*
 %{_mandir}/man1/ncdump.1*
 %{_mandir}/man1/ncgen.1*
@@ -251,7 +268,7 @@
 %files c++
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libnetcdf_c++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnetcdf_c++.so.5
+%attr(755,root,root) %ghost %{_libdir}/libnetcdf_c++.so.4
 
 %files c++-devel
 %defattr(644,root,root,755)
@@ -297,6 +314,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.36  2011/05/04 18:11:48  qboosh
+- updated to 4.1.2 (note: new libnetcdf,libnetcdf_c++ sonames)
+- added link patch
+
 Revision 1.35  2011/02/04 23:36:52  sparky
 - %description <name> for correct %package
 

================================================================
Index: packages/netcdf/netcdf-link.patch
diff -u /dev/null packages/netcdf/netcdf-link.patch:1.1
--- /dev/null	Wed May  4 20:11:53 2011
+++ packages/netcdf/netcdf-link.patch	Wed May  4 20:11:48 2011
@@ -0,0 +1,30 @@
+--- netcdf-4.1.2/fortran/Makefile.am.orig	2011-03-30 01:13:37.000000000 +0200
++++ netcdf-4.1.2/fortran/Makefile.am	2011-05-04 18:11:56.110181060 +0200
+@@ -76,6 +76,7 @@
+ if BUILD_SEPARATE_FORTRAN
+ lib_LTLIBRARIES = libnetcdff.la
+ libnetcdff_la_LDFLAGS = $(AM_LDFLAGS) -version-number 5:1:0 
++libnetcdff_la_LIBADD += $(top_builddir)/liblib/libnetcdf.la
+ else
+ noinst_LTLIBRARIES = libnetcdff.la
+ endif
+--- netcdf-4.1.2/Makefile.am.orig	2011-03-30 01:13:38.000000000 +0200
++++ netcdf-4.1.2/Makefile.am	2011-05-04 18:16:10.500189577 +0200
+@@ -115,8 +115,8 @@
+ # If using dispatch, then the order is different
+ if BUILD_SEPARATE_FORTRAN
+ SUBDIRS = include $(UDUNITS) $(H5_TEST_DIR) $(DISPATCHDIR) $(OCLIB)	\
+-$(F90_DIR) $(F77_DIR) $(LIBSRC_DIR) $(LIBSRC4_DIR) $(NCDAP3) $(NCDAP4)	\
+-$(LIBCDMR) ${ASSEMBLEDIR} $(V2_TEST) $(NCGEN3) $(NCGEN) $(NCDUMP)	\
++$(LIBSRC_DIR) $(LIBSRC4_DIR) $(NCDAP3) $(NCDAP4)	\
++$(LIBCDMR) ${ASSEMBLEDIR} $(F90_DIR) $(F77_DIR) $(V2_TEST) $(NCGEN3) $(NCGEN) $(NCDUMP)	\
+ $(F77_TEST) ${CXX_DIR} $(CXX4) $(NC_TEST4) $(NC_TEST_DIR)		\
+ $(NCDAPTESTDIR) man4 $(EXAMPLES) $(LIBCF)
+ else
+--- netcdf-4.1.2/cxx/Makefile.am.orig	2011-05-04 18:27:25.440212176 +0200
++++ netcdf-4.1.2/cxx/Makefile.am	2011-05-04 18:27:06.136878198 +0200
+@@ -73,3 +73,4 @@
+ # Library source.
+ libnetcdf_c___la_SOURCES = netcdf.cpp ncvalues.cpp
+ libnetcdf_c___la_LDFLAGS = -version-number 4:1:0
++libnetcdf_c___la_LIBADD = $(top_builddir)/liblib/libnetcdf.la
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netcdf/netcdf.spec?r1=1.35&r2=1.36&f=u