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.spec b/libdap.spec index c91fc07..da86394 100644 --- a/libdap.spec +++ b/libdap.spec @@ -11,6 +11,8 @@ Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz 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) @@ -62,6 +64,7 @@ Documentation of the libdap library. %setup -q %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 @@ -130,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT * 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