rpms/libnc-dap/EL-4 libnc-dap-3.7.0-nolibdir.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 libnc-dap.spec, 1.3, 1.4 sources, 1.3, 1.4

Patrice Dumas (pertusus) fedora-extras-commits at redhat.com
Thu Dec 27 13:30:57 UTC 2007


Author: pertusus

Update of /cvs/extras/rpms/libnc-dap/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5595

Modified Files:
	.cvsignore libnc-dap.spec sources 
Added Files:
	libnc-dap-3.7.0-nolibdir.patch 
Log Message:
sync with devel

libnc-dap-3.7.0-nolibdir.patch:

--- NEW FILE libnc-dap-3.7.0-nolibdir.patch ---
diff -up libnc-dap-3.7.0/ncdap-config.in.nolibdir libnc-dap-3.7.0/ncdap-config.in
--- libnc-dap-3.7.0/ncdap-config.in.nolibdir	2007-10-21 11:04:28.000000000 +0200
+++ libnc-dap-3.7.0/ncdap-config.in	2007-10-21 11:04:57.000000000 +0200
@@ -4,7 +4,6 @@
 #
 prefix=@prefix@
 exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
 usage()
@@ -68,11 +67,11 @@ while test $# -gt 0; do
 	;;
 
     --libs)
-       	echo "-L${libdir} -lnc-dap @LIBS@"
+       	echo "-lnc-dap @LIBS@"
        	;;
 
     --flibs)
-       	echo "-L${libdir} -lnc-dap @LIBS@ @FLIBS@ -lstdc++"
+       	echo "-lnc-dap @LIBS@ @FLIBS@ -lstdc++"
        	;;
 
     --prefix)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/EL-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	3 Mar 2006 08:05:05 -0000	1.3
+++ .cvsignore	27 Dec 2007 13:30:17 -0000	1.4
@@ -1 +1 @@
-libnc-dap-3.6.0.tar.gz
+libnc-dap-3.7.0.tar.gz


Index: libnc-dap.spec
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/EL-4/libnc-dap.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libnc-dap.spec	3 Mar 2006 08:05:05 -0000	1.3
+++ libnc-dap.spec	27 Dec 2007 13:30:17 -0000	1.4
@@ -1,32 +1,36 @@
 Name: libnc-dap
 Summary: The NetCDF interface to DAP-2 from OPeNDAP
-Version: 3.6.0
-Release: 1%{?dist}
+Version: 3.7.0
+Release: 9%{?dist}
 
-Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
+Group: Development/Libraries
+# ncdump, netcdf headers, lnetcdf are coverd by a BSD/MIT-like license
+# but they are linked statically against libnc-dap
+License: LGPLv2+
 URL: http://www.opendap.org/
+Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libnc-dap-%{version}.tar.gz 
+Patch0: libnc-dap-3.7.0-nolibdir.patch
 
-Group: Development/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: LGPL/BSD
-# Mandrake and Fedora
-BuildRequires: libdap-devel >= 3.6.0
+BuildRequires: libdap-devel >= 3.7.3 gcc-g77
 
 %description
-The libnc-dap library is a call-for-call replacement for netcdf 3.5 (and
-is mostly compatible with netcdf 3.6). It can read and write to and from
-netcdf files on the local machine and it can read from DAP2 compatible data
-servers running on local or remote machines. Data served using DAP2 need
-not be stored in netcdf files to be read using this replacement library.
+The libnc-dap library is a call-for-call replacement for netcdf. It can 
+read and write to and from netcdf files on the local machine and it can 
+read from DAP2 compatible data servers running on local or remote 
+machines. Data served using DAP2 need not be stored in netcdf files 
+to be read using this replacement library.
 Also included in this package is the ncdump utility, also bundled with the
-original netcdf library, relinked with the library and thus able to read
-from DAP2 compatible servers.
+original netcdf library, renamed dncdump, relinked with the library and 
+thus able to read from DAP2 compatible servers.
 
 %package devel
-Summary: Static libraries and header files from libnc-dap
+Summary: Development files and header files from libnc-dap
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libdap-devel >= 3.6.0
+Requires: libdap-devel >= 3.7.0
+# for /usr/share/aclocal owning
+Requires: automake
 
 %description devel
 This package contains all the files needed to develop applications that
@@ -34,16 +38,19 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .nolibdir
+rm -rf netcdf/.svn
 
 %build
-%configure
+%configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm -rf netcdf/.svn
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+
+mv $RPM_BUILD_ROOT%{_bindir}/ncdump $RPM_BUILD_ROOT%{_bindir}/dncdump
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,27 +68,67 @@
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libnc-dap.so
-%{_libdir}/libnc-dap.a
 %{_bindir}/ncdap-config
 %{_includedir}/libnc-dap/
 %{_datadir}/aclocal/*
 
 
 %changelog
-* Tue Feb 28 2006 James Gallagher <jgallagher at opendap.org> - 3.6.0-1
+* Mon Dec 17 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-9
+- rebuild against newer libdap
+
+* Sun Oct 21 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-8
+- remove reference to libdir in ncdap-config, should fix multilib conflict
+  (#342251)
+
+* Wed Aug 22 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-7
+- fix license
+- add gawk BuildRequires
+
+* Fri Jun  1 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-4
+- remove static libs
+
+* Tue May  1 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-3
+- Buildrequires g77 for the fortran API
+
+* Mon Apr 30 2007 Patrice Dumas <pertusus at free.fr> 3.7.0-2
+- update to 3.7.0
+
+* Tue Oct 31 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-5
+- licence is LGPL since it cause the BSD code to be distributed as LGPL too
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.6.2-4
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Wed Sep 20 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-3
+- rebuild against libdap 3.7.2
+
+* Wed Sep  6 2006 Patrice Dumas <pertusus at free.fr> 3.6.2-2
+- update to 3.6.2
+
+* Sat Jul 22 2006 Patrice Dumas <pertusus at free.fr> 3.6.0-4
+- BuildRequires the 3.7.0 libdap library or above
+
+* Sat Jul 22 2006 Patrice Dumas <pertusus at free.fr> 3.6.0-3
+- quick and dirty patch to build against newer libdap
+
+* Fri Jul 21 2006 Patrice Dumas <pertusus at free.fr> 3.6.0-2
+- rebuild against newer libdap
+
+* Tue Feb 28 2006 James Gallagher <jgallagher at opendap.org> - 3.6.0-1.1
 - new release
 
-* Mon Nov 21 2005 Patrice Dumas <dumas at centre-cired.fr> - 3.5.2-5
+* Mon Nov 21 2005 Patrice Dumas <pertusus at free.fr> - 3.5.2-5
 - fix Source0
 
-* Tue Aug 30 2005 Patrice Dumas <dumas at centre-cired.fr> - 3.5.2-4
+* Tue Aug 30 2005 Patrice Dumas <pertusus at free.fr> - 3.5.2-4
 - Add missing Requires
 - remove the INSTALL file and add the netcdf directory
 
 * Fri Aug 19 2005 James Gallagher <jimg at zoey.opendap.org> 3.5.2-3
 - Added README.translation and INSTALL; version to 3.5.2
 
-* Sat Jul  2 2005 Patrice Dumas <dumas at centre-cired.fr> - 3.5.1-2
+* Sat Jul  2 2005 Patrice Dumas <pertusus at free.fr> - 3.5.1-2
 - Support for shared libraries
 
 * Mon Jun 20 2005 James Gallagher <jimg at otaku.opendap.org> 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libnc-dap/EL-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	3 Mar 2006 08:05:05 -0000	1.3
+++ sources	27 Dec 2007 13:30:17 -0000	1.4
@@ -1 +1 @@
-95f3940476e0d3f019bd58ad7523a5dd  libnc-dap-3.6.0.tar.gz
+cb1c518725e1b2bb6078a691a2377eea  libnc-dap-3.7.0.tar.gz




More information about the fedora-extras-commits mailing list