From 9b015cbfe3570595e808f79e28f9a27cc8e56ac9 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@nwra.com>
Date: Thu, 10 Jul 2014 13:51:55 -0600
Subject: [PATCH] Update to 3.13.1

- Run autoreconf to fix rpaths
---
 .gitignore                  |  1 +
 libdap-3.10.2-offline.patch | 13 -------------
 libdap-offline.patch        | 12 ++++++++++++
 libdap.spec                 | 17 +++++++++++++----
 sources                     |  2 +-
 5 files changed, 27 insertions(+), 18 deletions(-)
 delete mode 100644 libdap-3.10.2-offline.patch
 create mode 100644 libdap-offline.patch

diff --git a/.gitignore b/.gitignore
index b9481c9..5ed6c4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ libdap-3.10.2.tar.gz
 /libdap-3.11.1.tar.gz
 /libdap-3.11.3.tar.gz
 /libdap-3.11.7.tar.gz
+/libdap-3.13.1.tar.gz
diff --git a/libdap-3.10.2-offline.patch b/libdap-3.10.2-offline.patch
deleted file mode 100644
index 0c464d3..0000000
--- a/libdap-3.10.2-offline.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-offline.patch b/libdap-offline.patch
new file mode 100644
index 0000000..b3c9644
--- /dev/null
+++ b/libdap-offline.patch
@@ -0,0 +1,12 @@
+diff -up libdap-3.13.1/unit-tests/Makefile.am.offline libdap-3.13.1/unit-tests/Makefile.am
+--- libdap-3.13.1/unit-tests/Makefile.am.offline	2014-02-04 16:17:16.000000000 -0700
++++ libdap-3.13.1/unit-tests/Makefile.am	2014-07-10 13:39:07.193789391 -0600
+@@ -48,7 +48,7 @@ UNIT_TESTS = marshT arrayT attrTableT st
+ 	RegexTest                                                       \
+ 	ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest 	\
+ 	DDSTest	DDXParserTest generalUtilTest 		\
+-	HTTPCacheTest HTTPConnectTest parserUtilTest RCReaderTest 	\
++	parserUtilTest RCReaderTest 	\
+ 	SequenceTest SignalHandlerTest  MarshallerTest                  \
+ 	ServerFunctionsListUnitTest 
+ 	
diff --git a/libdap.spec b/libdap.spec
index c8a84f6..237860c 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -1,15 +1,17 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.11.7
-Release: 3%{?dist}
+Version: 3.13.1
+Release: 1%{?dist}
 
 License: LGPLv2+
 Group: Development/Libraries
 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
+Patch0:  libdap-offline.patch
 
+# For autoreconf
+BuildRequires: libtool
 BuildRequires: cppunit-devel
 BuildRequires: curl-devel
 BuildRequires: doxygen
@@ -66,6 +68,8 @@ mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
 
 
 %build
+# To fix rpath
+autoreconf -f -i
 %configure --disable-static --disable-dependency-tracking
 make %{?_smp_mflags}
 
@@ -74,6 +78,7 @@ make docs
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+rm $RPM_BUILD_ROOT%{_libdir}/libtest-types.a
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config
 
@@ -120,6 +125,10 @@ make check
 
 
 %changelog
+* Wed Jul 9 2014 Orion Poplawski <orion@cora.nwra.com> - 3.13.1-1
+- Update to 3.13.1
+- Run autoreconf to fix rpaths
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.7-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -187,7 +196,7 @@ make check
 * Wed Jul 22 2009 Orion Poplawski <orion@cora.nwra.com> - 3.9.3-1
 - Update to 3.9.3
 
-* Tue Mar  2 2009 Caolán McNamara <caolanm@redhat.com> - 3.8.2-3
+* Tue Mar  3 2009 Caolán McNamara <caolanm@redhat.com> - 3.8.2-3
 - include cstdio for std::sprintf
 
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-2
diff --git a/sources b/sources
index b668ee6..c58f050 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9c2713852b9ca508966ff8b8cc4e71b6  libdap-3.11.7.tar.gz
+1ce7aa2f9c370d7d8233e8055ae2e233  libdap-3.13.1.tar.gz