diff --git a/.gitignore b/.gitignore index 9199409..c33e231 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ libdap-3.10.2.tar.gz /libdap-3.11.0.tar.gz /libdap-3.11.1.tar.gz +/libdap-3.11.3.tar.gz diff --git a/libdap-curl.patch b/libdap-curl.patch deleted file mode 100644 index cf84ef1..0000000 --- a/libdap-curl.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up libdap-3.11.1/HTTPConnect.h.curl libdap-3.11.1/HTTPConnect.h ---- libdap-3.11.1/HTTPConnect.h.curl 2011-04-29 07:19:43.000000000 -0600 -+++ libdap-3.11.1/HTTPConnect.h 2011-11-22 13:11:58.059715070 -0700 -@@ -30,7 +30,6 @@ - #include - - #include --#include - #include - - #ifndef _rc_reader_h_ diff --git a/libdap-test.patch b/libdap-test.patch deleted file mode 100644 index a83a410..0000000 --- a/libdap-test.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- 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 f952b76..a9d9999 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: 5%{?dist} +Version: 3.11.3 +Release: 1%{?dist} License: LGPLv2+ Group: Development/Libraries @@ -9,10 +9,6 @@ URL: http://www.opendap.org/ Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz #Don't run HTTP tests - builders don't have network connections 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 # Compile with gcc 4.7 Patch3: libdap-gcc47.patch @@ -26,6 +22,8 @@ BuildRequires: libuuid-devel BuildRequires: libxml2-devel BuildRequires: pkgconfig +Provides: bundled(gnulib) + # This package could be relocatable. In that case uncomment the following # line #Prefix: %{_prefix} @@ -65,8 +63,6 @@ Documentation of the libdap library. %prep %setup -q %patch0 -p1 -b .offline -%patch1 -p1 -b .curl -%patch2 -p1 -b .test %patch3 -p1 -b .gcc47 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8 @@ -133,6 +129,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue May 15 2012 Orion Poplawski - 3.11.3-1 +- Update to 3.11.3 +- Drop curl and test patches applied upstream +- Add Provides: bundled(gnulib) (bug 821766) + * Tue Feb 28 2012 Fedora Release Engineering - 3.11.1-5 - Rebuilt for c++ ABI breakage diff --git a/sources b/sources index 54f3e7f..7389854 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -985b5b4f86394eea45a467c2100e9ec5 libdap-3.11.1.tar.gz +4f838e7bc487e77f3d4c937b473f7a23 libdap-3.11.3.tar.gz