From e6f024adb3ca618dca49b7d1e75f39be309a7c70 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Dec 28 2011 17:28:30 +0000 Subject: Add upstream patch to fix failing test --- diff --git a/libdap-test.patch b/libdap-test.patch new file mode 100644 index 0000000..a83a410 --- /dev/null +++ b/libdap-test.patch @@ -0,0 +1,7 @@ +--- libdap-3.11.1/tests/expr-testsuite/test.6b.base 2011-04-29 07:19:29.000000000 -0600 ++++ libdap/tests/expr-testsuite/test.6b.base 2011-12-28 10:12:10.266421449 -0700 +@@ -1,2 +1,2 @@ + Error: The number of dimensions in the constraint for i must match the number in the array. +- +\ No newline at end of file ++ diff --git a/libdap.spec b/libdap.spec index 94f6619..8255aeb 100644 --- a/libdap.spec +++ b/libdap.spec @@ -1,7 +1,7 @@ Name: libdap Summary: The C++ DAP2 library from OPeNDAP Version: 3.11.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -11,6 +11,8 @@ Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz Patch0: libdap-3.10.2-offline.patch # Patch for recent libcurl Patch1: libdap-curl.patch +# Upsteam patch to test output to fix failing test +Patch2: libdap-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +64,7 @@ Documentation of the libdap library. %setup -q %patch0 -p1 -b .offline %patch1 -p1 -b .curl +%patch2 -p1 -b .test iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C @@ -127,6 +130,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Dec 28 2011 Orion Poplawski - 3.11.1-2 +- Add upstream patch to fix failing test + * Tue Nov 22 2011 Orion Poplawski - 3.11.1-1 - Update to 3.11.1 - Add patch for current libcurl