diff --git a/libdap.spec b/libdap.spec index 3c24b08..abe453b 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,10 +1,9 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.7.6 -Release: 3%{?dist} -Patch0: libdap-3.7.6-lib_order.patch +Version: 3.7.7 +Release: 1%{?dist} -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 @@ -17,11 +16,15 @@ License: LGPL # 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 @@ -30,11 +33,13 @@ 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 @@ -42,6 +47,7 @@ Requires: automake This package contains all the files needed to develop applications that will use libdap. + %package doc Summary: Documentation of the libdap library Group: Documentation @@ -49,16 +55,16 @@ Group: Documentation %description doc Documentation of the libdap library. + %prep %setup -q -%patch0 -p1 -b .lib_order -touch -r Makefile.am.lib_order Makefile.am -touch -r Makefile.in.lib_order Makefile.in + %build -%configure --disable-dependency-tracking +%configure --disable-static --disable-dependency-tracking make %{?_smp_mflags} + %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p" @@ -70,14 +76,20 @@ 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 @@ -90,12 +102,10 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-,root,root,-) -%{_libdir}/libdap.a %{_libdir}/libdap.so %{_libdir}/libdapclient.so -%{_libdir}/libdapclient.a %{_libdir}/libdapserver.so -%{_libdir}/libdapserver.a +#%{_libdir}/pkgconfig/libdap*.pc %{_bindir}/dap-config %{_includedir}/libdap/ %{_datadir}/aclocal/* @@ -104,7 +114,15 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc __fedora_docs/html/ + %changelog +* Thu May 31 2007 Patrice Dumas 3.7.7-1 +- update to 3.7.7 + +* Sat May 12 2007 Patrice Dumas 3.7.6-4 +- remove static libs +- set the same doc file timestamps for all arches + * Mon Apr 30 2007 Patrice Dumas 3.7.6-3 - correct the library install order - keep timestamps