Compare commits
No commits in common. "rawhide" and "master" have entirely different histories.
|
|
@ -14,11 +14,3 @@ 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-3.20.10.tar.gz
|
||||
|
|
|
|||
26
192.patch
26
192.patch
|
|
@ -1,26 +0,0 @@
|
|||
From 5ccb4f14b0c620bf0271b00cb47770bca4c2439c Mon Sep 17 00:00:00 2001
|
||||
From: ndp-opendap <ndp@opendap.org>
|
||||
Date: Fri, 8 Jul 2022 08:23:02 -0700
|
||||
Subject: [PATCH] Fixing type issue in HTTPCache.cc
|
||||
|
||||
---
|
||||
HTTPCache.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/HTTPCache.cc b/HTTPCache.cc
|
||||
index 56e912be..f2b34214 100644
|
||||
--- a/HTTPCache.cc
|
||||
+++ b/HTTPCache.cc
|
||||
@@ -1028,10 +1028,10 @@ HTTPCache::read_metadata(const string &cachename, vector<string> &headers)
|
||||
"Could not open named cache entry meta data file.");
|
||||
}
|
||||
|
||||
- const unsigned long line_buf_len = 1024;
|
||||
+ const size_t line_buf_len = 1024;
|
||||
char line[line_buf_len];
|
||||
while (!feof(md) && fgets(line, line_buf_len, md)) {
|
||||
- line[min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline
|
||||
+ line[std::min(line_buf_len, strnlen(line, line_buf_len))-1] = '\0'; // erase newline
|
||||
headers.push_back(string(line));
|
||||
}
|
||||
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
diff -up libdap-3.20.10/Constructor.cc.include libdap-3.20.10/Constructor.cc
|
||||
--- libdap-3.20.10/Constructor.cc.include 2022-06-26 15:55:00.000000000 -0600
|
||||
+++ libdap-3.20.10/Constructor.cc 2023-01-17 07:23:47.199638401 -0700
|
||||
@@ -31,6 +31,7 @@
|
||||
|
||||
#include "config.h"
|
||||
|
||||
+#include <cstdint>
|
||||
#include <string>
|
||||
#include <sstream>
|
||||
#include <algorithm>
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index d325e52..123e73d 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -122,7 +122,6 @@ $(EXPRTESTSUITE) $(DMRTESTSUITE) $(GETDAPTESTSUITE)
|
||||
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)
|
||||
|
|
@ -10,19 +9,18 @@ index d325e52..123e73d 100644
|
|||
|
||||
# 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 --git a/unit-tests/Makefile.am b/unit-tests/Makefile.am
|
||||
index 58ecd20..abbf860 100644
|
||||
--- a/unit-tests/Makefile.am
|
||||
+++ b/unit-tests/Makefile.am
|
||||
@@ -85,9 +85,9 @@ D4-xml.tar.gz: D4-xml/DMR_*[0-9].xml
|
||||
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 GridTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
|
||||
RegexTest ArrayTest AttrTableTest ByteTest MIMEUtilTest ancT DASTest \
|
||||
- DDSTest DDXParserTest generalUtilTest HTTPConnectTest parserUtilTest \
|
||||
+ DDSTest DDXParserTest generalUtilTest parserUtilTest \
|
||||
RCReaderTest SequenceTest SignalHandlerTest MarshallerTest \
|
||||
- HTTPCacheTest ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
|
||||
+ ServerFunctionsListUnitTest Int8Test Int16Test UInt16Test \
|
||||
Int32Test UInt32Test Int64Test UInt64Test Float32Test Float64Test \
|
||||
D4BaseTypeFactoryTest BaseTypeFactoryTest util_mitTest
|
||||
- HTTPCacheTest ServerFunctionsListUnitTest
|
||||
+ ServerFunctionsListUnitTest
|
||||
|
||||
if DAP4_DEFINED
|
||||
UNIT_TESTS += D4MarshallerTest D4UnMarshallerTest D4DimensionsTest \
|
||||
|
|
|
|||
99
libdap.spec
99
libdap.spec
|
|
@ -1,21 +1,15 @@
|
|||
Name: libdap
|
||||
Summary: The C++ DAP2 library from OPeNDAP
|
||||
Version: 3.20.10
|
||||
Release: 3%{?dist}
|
||||
Version: 3.18.3
|
||||
Release: 5%{?dist}
|
||||
|
||||
License: LGPL-2.1-or-later
|
||||
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 for i686 build
|
||||
Patch1: https://github.com/OPENDAP/libdap4/pull/192.patch
|
||||
# Add missing includes for gcc 13
|
||||
# https://github.com/OPENDAP/libdap4/pull/215
|
||||
Patch2: libdap-include.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
# For autoreconf
|
||||
BuildRequires: libtool
|
||||
BuildRequires: bison >= 3.0
|
||||
|
|
@ -24,7 +18,6 @@ BuildRequires: curl-devel
|
|||
BuildRequires: doxygen
|
||||
BuildRequires: flex
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: libtirpc-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: openssl-devel
|
||||
|
|
@ -46,6 +39,7 @@ 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
|
||||
|
|
@ -60,13 +54,15 @@ will use libdap.
|
|||
|
||||
%package doc
|
||||
Summary: Documentation of the libdap library
|
||||
Group: Documentation
|
||||
|
||||
%description doc
|
||||
Documentation of the libdap library.
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0 -p1 -b .offline
|
||||
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
||||
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
||||
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
||||
|
|
@ -77,41 +73,42 @@ mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
|||
autoreconf -f -i
|
||||
%configure --disable-static --disable-dependency-tracking
|
||||
# --enable-valgrind - missing valgrind exclusions file
|
||||
%make_build
|
||||
make %{?_smp_mflags}
|
||||
|
||||
make docs
|
||||
|
||||
|
||||
%install
|
||||
%make_install INSTALL="%{__install} -p"
|
||||
make install DESTDIR=$RPM_BUILD_ROOT 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 html __dist_docs
|
||||
cp -pr docs __dist_docs
|
||||
# those .map and .md5 are of dubious use, remove them
|
||||
rm -f __dist_docs/*.map __dist_docs/*.md5
|
||||
rm -f __dist_docs/html/*.map __dist_docs/html/*.md5
|
||||
# use the ChangeLog timestamp to have the same timestamps for the doc files
|
||||
# for all arches
|
||||
touch -r ChangeLog __dist_docs/*
|
||||
touch -r ChangeLog __dist_docs/html/*
|
||||
|
||||
|
||||
%check
|
||||
# tarball is missing some needed files
|
||||
make check || :
|
||||
make check
|
||||
|
||||
|
||||
%ldconfig_scriptlets
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%files
|
||||
%license COPYRIGHT_W3C COPYING COPYRIGHT_URI
|
||||
%doc README.md NEWS README.dodsrc
|
||||
%doc README NEWS README.dodsrc
|
||||
%{_bindir}/getdap
|
||||
%{_bindir}/getdap4
|
||||
%{_libdir}/libdap.so.27*
|
||||
%{_libdir}/libdap.so.23*
|
||||
%{_libdir}/libdapclient.so.6*
|
||||
%{_libdir}/libdapserver.so.7*
|
||||
%{_mandir}/man1/getdap.1*
|
||||
|
|
@ -130,66 +127,10 @@ make check || :
|
|||
|
||||
%files doc
|
||||
%license COPYING COPYRIGHT_URI COPYRIGHT_W3C
|
||||
%doc __dist_docs/
|
||||
%doc __dist_docs/html/
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.10-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||
|
||||
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.20.10-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Fri Jul 01 2022 Orion Poplawski <orion@nwra.com> - 3.20.10-1
|
||||
- Update to 3.20.10
|
||||
|
||||
* 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
|
||||
|
||||
|
|
|
|||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (libdap-3.20.10.tar.gz) = a3e58550eb4153a3c9c11fcfba56d87e56273ada6c25c78f7bf04d38f533dd873d124ef52e5c8fa4b648c0bb08ad7295f06c3d23fa09abeea0b169bd03f95117
|
||||
SHA512 (libdap-3.18.3.tar.gz) = 49be4fbd55c90bcc0c2ec23345642204f76f79d4eb05f44e7584cb58d2dddc9f3238dcb3baf9823b19d7c5d87aeb868be5d2426bd2c8f0ae344dc3a42217416e
|
||||
|
|
|
|||
Loading…
Reference in New Issue