diff --git a/.cvsignore b/.cvsignore index 2b33426..a231646 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libdap-3.9.3.tar.gz +libdap-3.10.2.tar.gz diff --git a/import.log b/import.log new file mode 100644 index 0000000..9899a75 --- /dev/null +++ b/import.log @@ -0,0 +1 @@ +libdap-3_10_2-3_fc14:EL-6:libdap-3.10.2-3.fc14.src.rpm:1279639717 diff --git a/libdap-3.10.2-libuuid.patch b/libdap-3.10.2-libuuid.patch new file mode 100644 index 0000000..841c5f8 --- /dev/null +++ b/libdap-3.10.2-libuuid.patch @@ -0,0 +1,10 @@ +--- libdap-3.10.2/libdapserver.pc.in.libuuid 2010-05-17 12:28:40.000000000 -0600 ++++ libdap-3.10.2/libdapserver.pc.in 2010-07-14 10:50:46.471946436 -0600 +@@ -9,6 +9,6 @@ + Description: Server side of the OPeNDAP C++ implementation of the Data Access Protocol + Version: @VERSION@ + Requires: libdap +-Libs: -L${libdir} -ldapserver @UUID_LIBS@ ++Libs: -L${libdir} -ldapserver + Cflags: -I${includedir}/libdap + diff --git a/libdap-3.10.2-offline.patch b/libdap-3.10.2-offline.patch new file mode 100644 index 0000000..0c464d3 --- /dev/null +++ b/libdap-3.10.2-offline.patch @@ -0,0 +1,13 @@ +--- libdap-3.10.2/unit-tests/Makefile.in.offline 2010-06-03 04:05:28.000000000 -0600 ++++ libdap-3.10.2/unit-tests/Makefile.in 2010-07-15 11:13:15.993944501 -0600 +@@ -79,8 +79,8 @@ + @CPPUNIT_TRUE@ MIMEUtilTest$(EXEEXT) ancT$(EXEEXT) \ + @CPPUNIT_TRUE@ DASTest$(EXEEXT) DDSTest$(EXEEXT) \ + @CPPUNIT_TRUE@ DDXParserTest$(EXEEXT) DODSFilterTest$(EXEEXT) \ +-@CPPUNIT_TRUE@ generalUtilTest$(EXEEXT) HTTPCacheTest$(EXEEXT) \ +-@CPPUNIT_TRUE@ HTTPConnectTest$(EXEEXT) parserUtilTest$(EXEEXT) \ ++@CPPUNIT_TRUE@ generalUtilTest$(EXEEXT) \ ++@CPPUNIT_TRUE@ parserUtilTest$(EXEEXT) \ + @CPPUNIT_TRUE@ RCReaderTest$(EXEEXT) SequenceTest$(EXEEXT) \ + @CPPUNIT_TRUE@ SignalHandlerTest$(EXEEXT) \ + @CPPUNIT_TRUE@ CEFunctionsTest$(EXEEXT) \ diff --git a/libdap-3.10.2-soname.patch b/libdap-3.10.2-soname.patch new file mode 100644 index 0000000..cd111c2 --- /dev/null +++ b/libdap-3.10.2-soname.patch @@ -0,0 +1,11 @@ +--- libdap-3.10.2/configure.soname 2010-06-03 04:05:24.000000000 -0600 ++++ libdap-3.10.2/configure 2010-07-15 10:24:00.147942692 -0600 +@@ -2847,7 +2847,7 @@ + + + DAPLIB_CURRENT=12 +-DAPLIB_AGE=2 ++DAPLIB_AGE=1 + DAPLIB_REVISION=0 + + diff --git a/libdap-3.8.2-includes.patch b/libdap-3.8.2-includes.patch deleted file mode 100644 index effbd49..0000000 --- a/libdap-3.8.2-includes.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -ru libdap-3.8.2.orig/util_mit.cc libdap-3.8.2/util_mit.cc ---- libdap-3.8.2.orig/util_mit.cc 2009-03-03 15:12:12.000000000 +0000 -+++ libdap-3.8.2/util_mit.cc 2009-03-03 15:12:52.000000000 +0000 -@@ -35,6 +35,7 @@ - - #include - #include -+#include - #include - #include - -@@ -54,6 +55,7 @@ - using std::cerr; - using std::endl; - using std::string; -+using std::sprintf; - - #include "debug.h" - diff --git a/libdap.spec b/libdap.spec index 9608f8b..da86394 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,24 +1,27 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP -Version: 3.9.3 -Release: 2%{?dist} +Version: 3.10.2 +Release: 3%{?dist} -# the deflate program is covered by the W3C license -License: LGPLv2+ and W3C +License: LGPLv2+ Group: Development/Libraries URL: http://www.opendap.org/ Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz -Patch0: libdap-3.8.2-includes.patch +#Don't put -luuid in pkg-config libs +Patch0: libdap-3.10.2-libuuid.patch +#Bump the soname (by dropping DAPLIB_AGE) since we dropped some AIS* fuctions +Patch1: libdap-3.10.2-soname.patch +#Don't run HTTP tests - builders don't have network connections +Patch2: libdap-3.10.2-offline.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# 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: cppunit-devel +BuildRequires: curl-devel +BuildRequires: doxygen +BuildRequires: graphviz +BuildRequires: libuuid-devel +BuildRequires: libxml2-devel BuildRequires: pkgconfig # This package could be relocatable. In that case uncomment the following @@ -28,18 +31,18 @@ BuildRequires: pkgconfig %description The libdap++ library contains an implementation of DAP2. This package -contains the library, dap-config, getdap and deflate. The script dap-config +contains the library, dap-config, and getdap. The script dap-config simplifies using the library in other projects. The getdap utility is a 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. +library and demonstrates simple uses of it. %package devel 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: curl-devel +Requires: libxml2-devel Requires: pkgconfig # for the /usr/share/aclocal directory ownership Requires: automake @@ -59,7 +62,9 @@ Documentation of the libdap library. %prep %setup -q -%patch0 -p1 -b .includes +%patch0 -p1 -b .libuuid +%patch1 -p1 -b .soname +%patch2 -p1 -b .offline iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C @@ -87,6 +92,9 @@ rm -f __dist_docs/html/*.map __dist_docs/html/*.md5 touch -r ChangeLog __dist_docs/html/* +%check +make check + %clean rm -rf $RPM_BUILD_ROOT @@ -99,11 +107,10 @@ rm -rf $RPM_BUILD_ROOT %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 README NEWS COPYING COPYRIGHT_URI README.dodsrc %doc COPYRIGHT_W3C %files devel @@ -118,10 +125,25 @@ rm -rf $RPM_BUILD_ROOT %files doc %defattr(-,root,root,-) +%doc COPYING COPYRIGHT_URI COPYRIGHT_W3C %doc __dist_docs/html/ %changelog +* Thu Jul 15 2010 Orion Poplawski - 3.10.2-3 +- Add patch to bump soname as this dropped the AIS* functions +- Add BR cppunit-devel and %%check section +- Add patch to not run HTTP network tests + +* Wed Jul 14 2010 Orion Poplawski - 3.10.2-2 +- Add patch to remove -luuid from pkg-config libs + +* Tue Jul 13 2010 Orion Poplawski - 3.10.2-1 +- Update to 3.10.2 +- Deflate is no longer shipped +- Drop includes patch fixed upstream +- Add license to doc sub-package + * Fri Jul 24 2009 Fedora Release Engineering - 3.9.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index ff31d96..fce26f8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -597bf7aeb023186c65e1be4da868e75b libdap-3.9.3.tar.gz +4367f3266f20479a68d9fdaeaa001af8 libdap-3.10.2.tar.gz