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

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

.gitignore

@@ -14,3 +14,10 @@ libdap-3.10.2.tar.gz
 /libdap-3.18.1.tar.gz
 /libdap-3.18.2.tar.gz
 /libdap-3.18.3.tar.gz
+/libdap-3.19.1.tar.gz
+/libdap-3.20.3.tar.gz
+/libdap-3.20.4.tar.gz
+/libdap-3.20.5.tar.gz
+/libdap-3.20.6.tar.gz
+/libdap-3.20.8.tar.gz
+/libdap-3.20.9.tar.gz

libdap-offline.patch

@@ -1,7 +1,7 @@
-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
+diff -up libdap-3.20.3/tests/Makefile.am.orig libdap-3.20.3/tests/Makefile.am
+--- libdap-3.20.3/tests/Makefile.am.orig	2019-02-14 10:13:49.000000000 -0700
++++ libdap-3.20.3/tests/Makefile.am	2019-02-17 15:27:32.426858748 -0700
+@@ -120,7 +120,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDA
  	$(SHELL) '$(DDSTESTSUITE)' $(TESTSUITEFLAGS)
  	$(SHELL) '$(EXPRTESTSUITE)' $(TESTSUITEFLAGS)
  	$(SHELL) '$(DMRTESTSUITE)' $(TESTSUITEFLAGS)
@@ -9,18 +9,18 @@ diff -up libdap-3.18.1/tests/Makefile.am.offline libdap-3.18.1/tests/Makefile.am
  
  # 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
+diff -up libdap-3.20.3/unit-tests/Makefile.am.orig libdap-3.20.3/unit-tests/Makefile.am
+--- libdap-3.20.3/unit-tests/Makefile.am.orig	2019-02-17 15:27:32.426858748 -0700
++++ libdap-3.20.3/unit-tests/Makefile.am	2019-02-17 15:28:10.725606175 -0700
+@@ -78,9 +78,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
+-	HTTPCacheTest ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
++	ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
+ 	Int32Test UInt32Test Int64Test UInt64Test Float32Test Float64Test \
+ 	D4BaseTypeFactoryTest BaseTypeFactoryTest
  
- if DAP4_DEFINED
- UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \

libdap.spec

@@ -1,15 +1,16 @@
 Name: libdap
 Summary: The C++ DAP2 library from OPeNDAP
-Version: 3.18.3
-Release: 5%{?dist}
+Version: 3.20.9
+Release: 2%{?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
 
+BuildRequires: make
+BuildRequires: gcc-c++
 # For autoreconf
 BuildRequires: libtool
 BuildRequires: bison >= 3.0
@@ -18,6 +19,7 @@ BuildRequires: curl-devel
 BuildRequires: doxygen
 BuildRequires: flex
 BuildRequires: graphviz
+BuildRequires: libtirpc-devel
 BuildRequires: libuuid-devel
 BuildRequires: libxml2-devel
 BuildRequires: openssl-devel
@@ -39,7 +41,6 @@ library and demonstrates simple uses of it.
 
 %package devel
 Summary: Development and header files from libdap
-Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
 Requires: curl-devel
 Requires: libxml2-devel
@@ -54,15 +55,13 @@ will use libdap.
 
 %package doc
 Summary: Documentation of the libdap library
-Group: Documentation
 
 %description doc
 Documentation of the libdap library.
 
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .offline
+%autosetup -n %{name}-%{version} -p1
 iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
 touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
 mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -73,42 +72,41 @@ mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
 autoreconf -f -i
 %configure --disable-static --disable-dependency-tracking
 # --enable-valgrind - missing valgrind exclusions file
-make %{?_smp_mflags}
+%make_build
 
 make docs
 
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
+%make_install INSTALL="%{__install} -p"
 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
 
 rm -rf __dist_docs
-cp -pr docs __dist_docs
+cp -pr html __dist_docs
 # those .map and .md5 are of dubious use, remove them
-rm -f __dist_docs/html/*.map __dist_docs/html/*.md5
+rm -f __dist_docs/*.map __dist_docs/*.md5
 # use the ChangeLog timestamp to have the same timestamps for the doc files 
 # for all arches
-touch -r ChangeLog __dist_docs/html/*
+touch -r ChangeLog __dist_docs/*
 
 
 %check
-make check
+# tarball is missing some needed files
+make check || :
 
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 
 %files
 %license COPYRIGHT_W3C COPYING COPYRIGHT_URI
-%doc README NEWS README.dodsrc
+%doc README.md NEWS README.dodsrc
 %{_bindir}/getdap
 %{_bindir}/getdap4
-%{_libdir}/libdap.so.23*
+%{_libdir}/libdap.so.27*
 %{_libdir}/libdapclient.so.6*
 %{_libdir}/libdapserver.so.7*
 %{_mandir}/man1/getdap.1*
@@ -127,10 +125,57 @@ make check
 
 %files doc
 %license COPYING COPYRIGHT_URI COPYRIGHT_W3C
-%doc __dist_docs/html/
+%doc __dist_docs/
 
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jan 13 2022 Orion Poplawski <orion@nwra.com> - 3.20.9-1
+- Update to 3.20.9
+
+* Sat Nov 20 2021 Orion Poplawski <orion@nwra.com> - 3.20.8-1
+- Update to 3.20.8
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri May 08 2020 Orion Poplawski <orion@nwra.com> - 3.20.6-1
+- Update to 3.20.6
+
+* Sat Feb 08 2020 Orion Poplawski <orion@nwra.com> - 3.20.5-1
+- Update to 3.20.5
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jul 29 2019 Orion Poplawski <orion@nwra.com> - 3.20.4-1
+- Update to 3.20.4
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Feb 17 2019 Orion Poplawski <orion@nwra.com> - 3.20.3-1
+- Update to 3.20.3
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Jun 19 2018 Orion Poplawski <orion@nwra.com> - 3.19.1-1
+- Update to 3.19.1
+- Add patch to use libtirpc
+- Add BR gcc-c++
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.18.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (libdap-3.18.3.tar.gz) = 49be4fbd55c90bcc0c2ec23345642204f76f79d4eb05f44e7584cb58d2dddc9f3238dcb3baf9823b19d7c5d87aeb868be5d2426bd2c8f0ae344dc3a42217416e
+SHA512 (libdap-3.20.9.tar.gz) = 2e360148e5ca3b5c12552ff429b161d8be6905594ae2df98c5b005cd286cb803913b8336371cd07361082749122f7aa5cbc93ff1812ed598908afd0e83df927c