dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-libdap-3.5.3.tar.gz

.gitignore

@@ -0,0 +1 @@
+libdap-3.7.8.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libdap
-# $Id$
-NAME := libdap
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

libdap.spec

@@ -1,25 +1,30 @@
-
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.5.3
-Release: 2%{?dist}
+Version: 3.7.8
+Release: 1%{?dist}.1
 
-#Source0: http://www.opendap.org/pub/3.5/source/libdap-%{version}.tar.gz
-Source0: ftp://ftp.unidata.ucar.edu/pub/opendap/source/libdap-%{version}.tar.gz
+Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
 URL: http://www.opendap.org/
 
 Group: Development/Libraries
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-License: LGPL/W3C
+# the deflate program is covered by the W3C licence
+License: LGPL
+
 # Mandrake
 #BuildRequires: libcurl3-devel >= 7.10.6 libxml2-devel >= 2.5.7
 # fedora
 BuildRequires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
+BuildRequires: doxygen graphviz
+# deflate depends directly on zlib
+BuildRequires: zlib-devel
+BuildRequires: pkgconfig
 
 # This package could be relocatable. In that case uncomment the following
 # line
 #Prefix: %{_prefix}
 
+
 %description
 The libdap++ library contains an implementation of DAP2. This package
 contains the library, dap-config, getdap and deflate. The script dap-config
@@ -28,59 +33,134 @@ simple command-line tool to read from DAP2 servers. It is built using the
 library and demonstrates simple uses of it. The deflate utility is used by
 the library when it returns compressed responses.
 
+
 %package devel
-Summary: Static libraries and header files from libdap
+Summary: Development and header files from libdap
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
-#
+Requires: pkgconfig
+# for the /usr/share/aclocal directory ownership
+Requires: automake
+
 %description devel
 This package contains all the files needed to develop applications that
 will use libdap.
 
+
+%package doc
+Summary: Documentation of the libdap library
+Group: Documentation
+
+%description doc
+Documentation of the libdap library.
+
+
 %prep
 %setup -q
 
+
 %build
-%configure
+%configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
+make docs
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+rm $RPM_BUILD_ROOT/%{_libdir}/*.la
+
+rm -rf __fedora_docs
+cp -pr docs __fedora_docs
+# those .map and .md5 are of dubious use, remove them
+rm -f __fedora_docs/html/*.map __fedora_docs/html/*.md5
+# use the ChangeLog timestamp to have the same timestamps for the doc files 
+# for all arches
+touch -r ChangeLog __fedora_docs/html/*
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/getdap
 %{_sbindir}/deflate
 %{_libdir}/libdap.so.*
+%{_libdir}/libdapclient.so.*
+%{_libdir}/libdapserver.so.*
 %doc README NEWS COPYING COPYRIGHT_URI README.AIS README.dodsrc
 %doc COPYRIGHT_W3C
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libdap.a
 %{_libdir}/libdap.so
+%{_libdir}/libdapclient.so
+%{_libdir}/libdapserver.so
+%{_libdir}/pkgconfig/libdap*.pc
 %{_bindir}/dap-config
 %{_includedir}/libdap/
 %{_datadir}/aclocal/*
 
+%files doc
+%defattr(-,root,root,-)
+%doc __fedora_docs/html/
+
+
 %changelog
-* Mon Nov 21 2005 Patrice Dumas <dumas@centre-cired.fr> - 3.5.3-2
+* Thu Jul  5 2007 Patrice Dumas <pertusus@free.fr> 3.7.8-1.1
+- update to 3.7.8
+
+* Thu May 31 2007 Patrice Dumas <pertusus@free.fr> 3.7.7-1.1
+- update to 3.7.7
+
+* Sat May 12 2007 Patrice Dumas <pertusus@free.fr> 3.7.6-4
+- remove static libs
+- set the same doc file timestamps for all arches
+
+* Mon Apr 30 2007 Patrice Dumas <pertusus@free.fr> 3.7.6-3
+- correct the library install order
+- keep timestamps
+- add documentation in a subpackage
+
+* Mon Apr 30 2007 Patrice Dumas <pertusus@free.fr> 3.7.6-2
+- update to 3.7.6
+
+* Tue Oct 31 2006 Patrice Dumas <pertusus@free.fr> 3.7.2-3
+- rebuild for new libcurl soname
+
+* Thu Oct 05 2006 Christian Iseli <Christian.Iseli@licr.org> 3.7.2-2
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Tue Sep 19 2006 Patrice Dumas <pertusus@free.fr> 3.7.2-1
+- update to 3.7.2
+
+* Wed Sep  6 2006 Patrice Dumas <pertusus@free.fr> 3.7.1-1
+- update to 3.7.1
+- set licence to LGPL instead of W3C/LGPL, since only deflate is W3C, so
+  the whole is under the LGPL
+
+* Fri Jul 21 2006 Patrice Dumas <pertusus@free.fr> 3.7.0-1
+- update to 3.7.0
+
+* Mon Feb 27 2006 James Gallagher <jgallagher@opendap.org> - 3.6.0-1
+- update to 3.6.0
+
+* Mon Nov 21 2005 Patrice Dumas <pertusus@free.fr> - 3.5.3-2
 - fix Source0
 
-* Tue Aug 30 2005 Patrice Dumas <dumas@centre-cired.fr> - 3.5.2-3
+* Tue Aug 30 2005 Patrice Dumas <pertusus@free.fr> - 3.5.2-3
 - Add missing Requires
 
-* Sat Jul  2 2005 Patrice Dumas <dumas@centre-cired.fr> - 3.5.1-2
+* Sat Jul  2 2005 Patrice Dumas <pertusus@free.fr> - 3.5.1-2
 - Support for shared libraries
 - Add COPYING
 - Update with fedora template
@@ -92,7 +172,7 @@ rm -rf $RPM_BUILD_ROOT
 - Removed version numbers from .a and includes directory.
 
 * Tue May 10 2005 James Gallagher <jimg@zoey.opendap.org> 
-- Mostly works. Problems: Not sure if the %post script stuff works.
+- Mostly works. Problems: Not sure if the %%post script stuff works.
 - Must also address the RHEL3 package deps issue (curl 7.12.0 isn't available;
   not sure about xml2 2.5.7). At least the deps fail when they are not present!
 

sources

@@ -1 +1 @@
-62579a9814ccb39579796cdcc1560067  libdap-3.5.3.tar.gz
+69ca7dcc0bad43b4b74eac105b4587e2  libdap-3.7.8.tar.gz