Compare commits
No commits in common. "master" and "libdap-3_10_2-1_fc14" have entirely different histories.
master
...
libdap-3_1
1
.cvsignore
Normal file
1
.cvsignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
libdap-3.10.2.tar.gz
|
16
.gitignore
vendored
16
.gitignore
vendored
@ -1,16 +0,0 @@
|
|||||||
libdap-3.10.2.tar.gz
|
|
||||||
/libdap-3.11.0.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
|
|
||||||
/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
|
|
21
Makefile
Normal file
21
Makefile
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# Makefile for source rpm: libdap
|
||||||
|
# $Id: Makefile,v 1.1 2005/11/21 21:51:29 pertusus Exp $
|
||||||
|
NAME := libdap
|
||||||
|
SPECFILE = $(firstword $(wildcard *.spec))
|
||||||
|
|
||||||
|
define find-makefile-common
|
||||||
|
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
||||||
|
endef
|
||||||
|
|
||||||
|
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
||||||
|
|
||||||
|
ifeq ($(MAKEFILE_COMMON),)
|
||||||
|
# attept a checkout
|
||||||
|
define checkout-makefile-common
|
||||||
|
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
||||||
|
endef
|
||||||
|
|
||||||
|
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
||||||
|
endif
|
||||||
|
|
||||||
|
include $(MAKEFILE_COMMON)
|
@ -1,26 +0,0 @@
|
|||||||
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 \
|
|
195
libdap.spec
195
libdap.spec
@ -1,32 +1,25 @@
|
|||||||
Name: libdap
|
Name: libdap
|
||||||
Summary: The C++ DAP2 library from OPeNDAP
|
Summary: The C++ DAP2 library from OPeNDAP
|
||||||
Version: 3.18.3
|
Version: 3.10.2
|
||||||
Release: 5%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
URL: http://www.opendap.org/
|
URL: http://www.opendap.org/
|
||||||
Source0: http://www.opendap.org/pub/source/libdap-%{version}.tar.gz
|
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
|
|
||||||
|
|
||||||
# For autoreconf
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildRequires: libtool
|
|
||||||
BuildRequires: bison >= 3.0
|
|
||||||
BuildRequires: cppunit-devel
|
|
||||||
BuildRequires: curl-devel
|
BuildRequires: curl-devel
|
||||||
|
BuildRequires: libxml2-devel
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: flex
|
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: libuuid-devel
|
BuildRequires: libuuid-devel
|
||||||
BuildRequires: libxml2-devel
|
|
||||||
BuildRequires: openssl-devel
|
|
||||||
BuildRequires: pkgconfig
|
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
|
%description
|
||||||
@ -61,27 +54,22 @@ Documentation of the libdap library.
|
|||||||
|
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{version}
|
%setup -q
|
||||||
%patch0 -p1 -b .offline
|
|
||||||
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
||||||
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
||||||
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# To fix rpath
|
|
||||||
autoreconf -f -i
|
|
||||||
%configure --disable-static --disable-dependency-tracking
|
%configure --disable-static --disable-dependency-tracking
|
||||||
# --enable-valgrind - missing valgrind exclusions file
|
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
make docs
|
make docs
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
rm -rf $RPM_BUILD_ROOT
|
||||||
make install DESTDIR=$RPM_BUILD_ROOT 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
|
rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||||
mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config
|
mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config
|
||||||
|
|
||||||
@ -94,8 +82,8 @@ rm -f __dist_docs/html/*.map __dist_docs/html/*.md5
|
|||||||
touch -r ChangeLog __dist_docs/html/*
|
touch -r ChangeLog __dist_docs/html/*
|
||||||
|
|
||||||
|
|
||||||
%check
|
%clean
|
||||||
make check
|
rm -rf $RPM_BUILD_ROOT
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
@ -104,170 +92,31 @@ make check
|
|||||||
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%license COPYRIGHT_W3C COPYING COPYRIGHT_URI
|
%defattr(-,root,root,-)
|
||||||
%doc README NEWS README.dodsrc
|
|
||||||
%{_bindir}/getdap
|
%{_bindir}/getdap
|
||||||
%{_bindir}/getdap4
|
%{_libdir}/libdap.so.*
|
||||||
%{_libdir}/libdap.so.23*
|
%{_libdir}/libdapclient.so.*
|
||||||
%{_libdir}/libdapclient.so.6*
|
%{_libdir}/libdapserver.so.*
|
||||||
%{_libdir}/libdapserver.so.7*
|
%doc README NEWS COPYING COPYRIGHT_URI README.dodsrc
|
||||||
%{_mandir}/man1/getdap.1*
|
%doc COPYRIGHT_W3C
|
||||||
%{_mandir}/man1/getdap4.1*
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
|
%defattr(-,root,root,-)
|
||||||
%{_libdir}/libdap.so
|
%{_libdir}/libdap.so
|
||||||
%{_libdir}/libdapclient.so
|
%{_libdir}/libdapclient.so
|
||||||
%{_libdir}/libdapserver.so
|
%{_libdir}/libdapserver.so
|
||||||
%{_libdir}/libdap/
|
|
||||||
%{_libdir}/pkgconfig/libdap*.pc
|
%{_libdir}/pkgconfig/libdap*.pc
|
||||||
%{_bindir}/dap-config
|
%{_bindir}/dap-config
|
||||||
%{_includedir}/libdap/
|
%{_includedir}/libdap/
|
||||||
%{_datadir}/aclocal/*
|
%{_datadir}/aclocal/*
|
||||||
%{_mandir}/man1/dap-config.1*
|
|
||||||
|
|
||||||
%files doc
|
%files doc
|
||||||
%license COPYING COPYRIGHT_URI COPYRIGHT_W3C
|
%defattr(-,root,root,-)
|
||||||
|
%doc COPYING COPYRIGHT_URI COPYRIGHT_W3C
|
||||||
%doc __dist_docs/html/
|
%doc __dist_docs/html/
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
|
||||||
|
|
||||||
* Tue Jul 15 2014 Orion Poplawski <orion@cora.nwra.com> - 3.13.1-2
|
|
||||||
- Add patch to fix tests on ppc and arm
|
|
||||||
|
|
||||||
* 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
|
|
||||||
|
|
||||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.7-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed May 29 2013 Orion Poplawski <orion@cora.nwra.com> - 3.11.7-1
|
|
||||||
- Update to 3.11.7
|
|
||||||
- Drop gcc47 patch applied upstream
|
|
||||||
- spec cleanup
|
|
||||||
- Add BR openssl-devel
|
|
||||||
|
|
||||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.3-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
|
||||||
|
|
||||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.3-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
|
||||||
|
|
||||||
* Tue May 15 2012 Orion Poplawski <orion@cora.nwra.com> - 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 <rel-eng@lists.fedoraproject.org> - 3.11.1-5
|
|
||||||
- Rebuilt for c++ ABI breakage
|
|
||||||
|
|
||||||
* Sat Jan 14 2012 Orion Poplawski <orion@cora.nwra.com> - 3.11.1-4
|
|
||||||
- Add patch to compile with gcc 4.7
|
|
||||||
|
|
||||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.1-3
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Wed Dec 28 2011 Orion Poplawski <orion@cora.nwra.com> - 3.11.1-2
|
|
||||||
- Add upstream patch to fix failing test
|
|
||||||
|
|
||||||
* Tue Nov 22 2011 Orion Poplawski <orion@cora.nwra.com> - 3.11.1-1
|
|
||||||
- Update to 3.11.1
|
|
||||||
- Add patch for current libcurl
|
|
||||||
|
|
||||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.11.0-2
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Dec 10 2010 Orion Poplawski <orion@cora.nwra.com> - 3.11.0-1
|
|
||||||
- Update to 3.11.0
|
|
||||||
- Drop libuuid patch fixed upstream
|
|
||||||
- Drop soname patch
|
|
||||||
|
|
||||||
* Thu Jul 15 2010 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-3
|
|
||||||
- Add patch to bump soname as this dropped the AIS* functions
|
|
||||||
- Add BR cppunit-devel and %%check section
|
|
||||||
- Add patch to not run HTTP network tests
|
|
||||||
|
|
||||||
* Wed Jul 14 2010 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-2
|
|
||||||
- Add patch to remove -luuid from pkg-config libs
|
|
||||||
|
|
||||||
* Tue Jul 13 2010 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-1
|
* Tue Jul 13 2010 Orion Poplawski <orion@cora.nwra.com> - 3.10.2-1
|
||||||
- Update to 3.10.2
|
- Update to 3.10.2
|
||||||
- Deflate is no longer shipped
|
- Deflate is no longer shipped
|
||||||
@ -280,7 +129,7 @@ make check
|
|||||||
* Wed Jul 22 2009 Orion Poplawski <orion@cora.nwra.com> - 3.9.3-1
|
* Wed Jul 22 2009 Orion Poplawski <orion@cora.nwra.com> - 3.9.3-1
|
||||||
- Update to 3.9.3
|
- Update to 3.9.3
|
||||||
|
|
||||||
* Tue Mar 3 2009 Caolán McNamara <caolanm@redhat.com> - 3.8.2-3
|
* Tue Mar 2 2009 Caolán McNamara <caolanm@redhat.com> - 3.8.2-3
|
||||||
- include cstdio for std::sprintf
|
- include cstdio for std::sprintf
|
||||||
|
|
||||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-2
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.8.2-2
|
||||||
|
Loading…
Reference in New Issue
Block a user