- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -4,3 +4,13 @@ libdap-3.10.2.tar.gz
 /libdap-3.11.3.tar.gz
 /libdap-3.11.7.tar.gz
 /libdap-3.13.1.tar.gz
+/libdap-3.13.3.tar.gz
+/libdap-3.14.0.tar.gz
+/libdap-3.15.1.tar.gz
+/libdap-3.16.0.tar.gz
+/libdap-3.17.0.tar.gz
+/version-3.17.1.tar.gz
+/libdap-3.17.2.tar.gz
+/libdap-3.18.1.tar.gz
+/libdap-3.18.2.tar.gz
+/libdap-3.18.3.tar.gz

libdap-getopt.patch

@@ -1,48 +0,0 @@
-diff -up libdap-3.13.1/unit-tests/DDSTest.cc.getopt libdap-3.13.1/unit-tests/DDSTest.cc
---- libdap-3.13.1/unit-tests/DDSTest.cc.getopt	2014-02-04 15:30:33.000000000 -0700
-+++ libdap-3.13.1/unit-tests/DDSTest.cc	2014-07-15 10:41:17.078813570 -0600
-@@ -496,7 +496,7 @@ int main(int argc, char*argv[]) {
-     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- 
-     GetOpt getopt(argc, argv, "d");
--    char option_char;
-+    int option_char;
-     while ((option_char = getopt()) != EOF)
-         switch (option_char) {
-         case 'd':
-diff -up libdap-3.13.1/unit-tests/DDXParserTest.cc.getopt libdap-3.13.1/unit-tests/DDXParserTest.cc
---- libdap-3.13.1/unit-tests/DDXParserTest.cc.getopt	2014-02-04 16:15:11.000000000 -0700
-+++ libdap-3.13.1/unit-tests/DDXParserTest.cc	2014-07-15 10:35:11.120617282 -0600
-@@ -652,7 +652,7 @@ int main(int argc, char*argv[])
- 	runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- 
- 	GetOpt getopt(argc, argv, "d");
--	char option_char;
-+	int option_char;
- 	while ((option_char = getopt()) != EOF)
- 		switch (option_char) {
- 		case 'd':
-diff -up libdap-3.13.1/unit-tests/SequenceTest.cc.getopt libdap-3.13.1/unit-tests/SequenceTest.cc
---- libdap-3.13.1/unit-tests/SequenceTest.cc.getopt	2014-07-15 10:42:22.638487942 -0600
-+++ libdap-3.13.1/unit-tests/SequenceTest.cc	2014-07-15 10:42:33.222434496 -0600
-@@ -432,7 +432,7 @@ int main(int argc, char*argv[]) {
-     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- 
-     GetOpt getopt(argc, argv, "d");
--    char option_char;
-+    int option_char;
-     while ((option_char = getopt()) != EOF)
-         switch (option_char) {
-         case 'd':
-diff -up libdap-3.13.1/unit-tests/ServerFunctionsListUnitTest.cc.getopt libdap-3.13.1/unit-tests/ServerFunctionsListUnitTest.cc
---- libdap-3.13.1/unit-tests/ServerFunctionsListUnitTest.cc.getopt	2013-10-01 10:05:23.000000000 -0600
-+++ libdap-3.13.1/unit-tests/ServerFunctionsListUnitTest.cc	2014-07-15 10:41:40.310697732 -0600
-@@ -183,7 +183,7 @@ int main(int argc, char*argv[]) {
-     runner.addTest(CppUnit::TestFactoryRegistry::getRegistry().makeTest());
- 
-     GetOpt getopt(argc, argv, "d");
--    char option_char;
-+    int option_char;
-     while ((option_char = getopt()) != EOF)
-         switch (option_char) {
-         case 'd':

libdap-offline.patch

@@ -1,12 +1,26 @@
-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 -up libdap-3.18.1/tests/Makefile.am.offline libdap-3.18.1/tests/Makefile.am
+--- libdap-3.18.1/tests/Makefile.am.offline	2015-10-19 16:03:35.000000000 -0600
++++ libdap-3.18.1/tests/Makefile.am	2016-08-12 09:33:37.767696856 -0600
+@@ -112,7 +112,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDA
+ 	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
+ 	$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
+-	$(SHELL) '$(GETDAPTESTSUITE)' $(TESTSUITEFLAGS)
+ 
+ # Make sure there are no spaces after the DASTESTSUITE names. jhrg 3/16/15
+ # Delete the scripts here and not using CLEANFILES because this target is
+diff -up libdap-3.18.1/unit-tests/Makefile.am.offline libdap-3.18.1/unit-tests/Makefile.am
+--- libdap-3.18.1/unit-tests/Makefile.am.offline	2016-08-12 09:33:37.768696852 -0600
++++ libdap-3.18.1/unit-tests/Makefile.am	2016-08-12 09:34:12.984547765 -0600
+@@ -67,9 +67,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
+ if CPPUNIT
+ UNIT_TESTS = marshT arrayT attrTableT structT sequenceT ddsT dasT \
+ 	RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
+-	DDSTest	DDXParserTest  generalUtilTest HTTPConnectTest parserUtilTest \
++	DDSTest	DDXParserTest  generalUtilTest parserUtilTest \
+ 	RCReaderTest SequenceTest SignalHandlerTest  MarshallerTest \
+-	HTTPCacheTest ServerFunctionsListUnitTest
++	ServerFunctionsListUnitTest
+ 
+ if DAP4_DEFINED
+ UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \

libdap.spec

@@ -1,35 +1,33 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.13.1
-Release: 3%{?dist}
+Version: 3.18.3
+Release: 5%{?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-offline.patch
-# Fix test hangs on ppc and arm
-# https://bugzilla.redhat.com/show_bug.cgi?id=1118776
-Patch1:  libdap-getopt.patch
+Patch0: libdap-offline.patch
 
 # For autoreconf
 BuildRequires: libtool
+BuildRequires: bison >= 3.0
 BuildRequires: cppunit-devel
 BuildRequires: curl-devel
 BuildRequires: doxygen
+BuildRequires: flex
 BuildRequires: graphviz
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 BuildRequires: openssl-devel
 BuildRequires: pkgconfig
+%ifnarch s390 %{mips}
+BuildRequires: valgrind
+%endif
 
 Provides: bundled(gnulib)
 
-# This package could be relocatable. In that case uncomment the following
-# line
-#Prefix: %{_prefix}
-
 
 %description
 The libdap++ library contains an implementation of DAP2. This package
@@ -63,9 +61,8 @@ Documentation of the libdap library.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 %patch0 -p1 -b .offline
-%patch1 -p1 -b .getopt
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -75,6 +72,7 @@ mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
 # To fix rpath
 autoreconf -f -i
 %configure --disable-static --disable-dependency-tracking
+# --enable-valgrind - missing valgrind exclusions file
 make %{?_smp_mflags}
 
 make docs
@@ -82,7 +80,8 @@ make docs
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
-rm $RPM_BUILD_ROOT%{_libdir}/libtest-types.a
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/libdap
+mv $RPM_BUILD_ROOT%{_libdir}/libtest-types.a $RPM_BUILD_ROOT%{_libdir}/libdap/
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config
 
@@ -105,18 +104,21 @@ make check
 
 
 %files
+%license COPYRIGHT_W3C COPYING COPYRIGHT_URI
+%doc README NEWS README.dodsrc
 %{_bindir}/getdap
-%{_libdir}/libdap.so.*
-%{_libdir}/libdapclient.so.*
-%{_libdir}/libdapserver.so.*
+%{_bindir}/getdap4
+%{_libdir}/libdap.so.23*
+%{_libdir}/libdapclient.so.6*
+%{_libdir}/libdapserver.so.7*
 %{_mandir}/man1/getdap.1*
-%doc README NEWS COPYING COPYRIGHT_URI README.dodsrc
-%doc COPYRIGHT_W3C
+%{_mandir}/man1/getdap4.1*
 
 %files devel
 %{_libdir}/libdap.so
 %{_libdir}/libdapclient.so
 %{_libdir}/libdapserver.so
+%{_libdir}/libdap/
 %{_libdir}/pkgconfig/libdap*.pc
 %{_bindir}/dap-config
 %{_includedir}/libdap/
@@ -124,11 +126,83 @@ make check
 %{_mandir}/man1/dap-config.1*
 
 %files doc
-%doc COPYING COPYRIGHT_URI COPYRIGHT_W3C
+%license COPYING COPYRIGHT_URI COPYRIGHT_W3C
 %doc __dist_docs/html/
 
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Jan 11 2017 Orion Poplawski <orion@cora.nwra.com> - 3.18.3-1
+- Update to 3.18.3
+
+* Tue Dec 6 2016 Orion Poplawski <orion@cora.nwra.com> - 3.18.2-1
+- Update to 3.18.2
+- Drop getopt and big endian baselines patches applied upstream
+
+* Fri Aug 26 2016 Dan Horák <dan[at]danny.cz> - 3.18.1-2
+- Add missing big endian baselines (#1366787)
+
+* Fri Aug 12 2016 Orion Poplawski <orion@cora.nwra.com> - 3.18.1-1
+- Update to 3.18.1
+- Add patch to fix getopt usage again
+
+* Thu Aug 11 2016 Michal Toman <mtoman@fedoraproject.org> - 3.17.2-2
+- No valgrind on MIPS
+
+* Fri Apr 15 2016 Than Ngo <than@redhat.com> - 3.17.2-1
+- update to 3.17.2
+
+* Fri Apr 15 2016 Dan Horák <dan[at]danny.cz> - 3.17.1-1
+- Update to 3.17.1
+- Switch to github for source archive
+- Add missing big endian baselines (#1325114)
+
+* Tue Feb 9 2016 Orion Poplawski <orion@cora.nwra.com> - 3.17.0-1
+- Update to 3.17.0
+- Add patch for gcc 6 support
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.16.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Thu Jan 14 2016 Orion Poplawski <orion@cora.nwra.com> - 3.16.0-1
+- Update to 3.16.0
+
+* Wed Sep 23 2015 Orion Poplawski <orion@cora.nwra.com> - 3.15.1-1
+- Update to 3.15.1
+- Drop flex, getopt, and include patches fixed upstream
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.14.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Jun 04 2015 Dan Horák <dan[at]danny.cz> - 3.14.0-4
+- valgrind available only on selected arches
+
+* Fri Apr 17 2015 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-3
+- Add patch to add needed includes
+
+* Fri Apr 17 2015 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-2
+- Ship libtest-types.a for dependent package tests
+
+* Thu Apr 16 2015 Orion Poplawski <orion@cora.nwra.com> - 3.14.0-1
+- Update to 3.14.0
+- Add patch to fix flex compilation
+- Add patch to fix getopt usage
+- Update offline patch for new test
+
+* Mon Feb 23 2015 Orion Poplawski <orion@cora.nwra.com> - 3.13.3-1
+- Update to 3.13.3
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

sources

@@ -1 +1 @@
-1ce7aa2f9c370d7d8233e8055ae2e233  libdap-3.13.1.tar.gz
+SHA512 (libdap-3.18.3.tar.gz) = 49be4fbd55c90bcc0c2ec23345642204f76f79d4eb05f44e7584cb58d2dddc9f3238dcb3baf9823b19d7c5d87aeb868be5d2426bd2c8f0ae344dc3a42217416e