Compare commits
No commits in common. "master" and "F-9-start" have entirely different histories.
1
.cvsignore
Normal file
1
.cvsignore
Normal file
@ -0,0 +1 @@
|
||||
libdap-3.7.10.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$
|
||||
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 $$/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)
|
||||
30
libdap-3.7.8-nolibdir.patch
Normal file
30
libdap-3.7.8-nolibdir.patch
Normal file
@ -0,0 +1,30 @@
|
||||
diff -up libdap-3.7.10/dap-config.in.nolibdir libdap-3.7.10/dap-config.in
|
||||
--- libdap-3.7.10/dap-config.in.nolibdir 2007-05-12 23:32:21.000000000 +0200
|
||||
+++ libdap-3.7.10/dap-config.in 2008-01-02 09:48:20.000000000 +0100
|
||||
@@ -4,7 +4,6 @@
|
||||
#
|
||||
prefix=@prefix@
|
||||
exec_prefix=${prefix}
|
||||
-libdir=${exec_prefix}/lib
|
||||
includedir=${prefix}/include
|
||||
|
||||
usage()
|
||||
@@ -59,15 +58,15 @@ while test $# -gt 0; do
|
||||
;;
|
||||
|
||||
--libs)
|
||||
- echo "-L${libdir} -ldap -ldapserver -ldapclient @CURL_STATIC_LIBS@ @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@"
|
||||
+ echo "`pkg-config --libs libdap libdapserver libdapclient`"
|
||||
;;
|
||||
|
||||
--server-libs)
|
||||
- echo "-L${libdir} -ldap -ldapserver @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@"
|
||||
+ echo "`pkg-config --libs libdapserver`"
|
||||
;;
|
||||
|
||||
--client-libs)
|
||||
- echo "-L${libdir} -ldap -ldapclient @CURL_STATIC_LIBS@ @XML2_STATIC_LIBS@ @PTHREAD_LIBS@ @LIBS@"
|
||||
+ echo "`pkg-config --libs libdapclient`"
|
||||
;;
|
||||
|
||||
--prefix)
|
||||
@ -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 \
|
||||
244
libdap.spec
244
libdap.spec
@ -1,48 +1,46 @@
|
||||
Name: libdap
|
||||
Summary: The C++ DAP2 library from OPeNDAP
|
||||
Version: 3.18.3
|
||||
Release: 5%{?dist}
|
||||
Version: 3.7.10
|
||||
Release: 3%{?dist}
|
||||
|
||||
License: LGPLv2+
|
||||
# the deflate program is covered by the W3C license
|
||||
License: LGPLv2+ and W3C
|
||||
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
|
||||
|
||||
# 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
|
||||
Patch0: libdap-3.7.8-nolibdir.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
# Mandrake
|
||||
# BuildRequires: libcurl3-devel >= 7.10.6 libxml2-devel >= 2.5.7
|
||||
# fedora
|
||||
BuildRequires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
|
||||
BuildRequires: doxygen graphviz
|
||||
# deflate depends directly on zlib
|
||||
BuildRequires: zlib-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
|
||||
contains the library, dap-config, and getdap. The script dap-config
|
||||
contains the library, dap-config, getdap and deflate. The script dap-config
|
||||
simplifies using the library in other projects. The getdap utility is a
|
||||
simple command-line tool to read from DAP2 servers. It is built using the
|
||||
library and demonstrates simple uses of it.
|
||||
library and demonstrates simple uses of it. The deflate utility is used by
|
||||
the library when it returns compressed responses.
|
||||
|
||||
|
||||
%package devel
|
||||
Summary: Development and header files from libdap
|
||||
Group: Development/Libraries
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
Requires: curl-devel
|
||||
Requires: libxml2-devel
|
||||
Requires: curl-devel >= 7.10.6 libxml2-devel >= 2.5.7
|
||||
Requires: pkgconfig
|
||||
# for the /usr/share/aclocal directory ownership
|
||||
Requires: automake
|
||||
@ -61,29 +59,24 @@ Documentation of the libdap library.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0 -p1 -b .offline
|
||||
%setup -q
|
||||
%patch0 -p1 -b .nolibdir
|
||||
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
||||
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
||||
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
||||
|
||||
|
||||
%build
|
||||
# To fix rpath
|
||||
autoreconf -f -i
|
||||
%configure --disable-static --disable-dependency-tracking
|
||||
# --enable-valgrind - missing valgrind exclusions file
|
||||
make %{?_smp_mflags}
|
||||
|
||||
make docs
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
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 $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||
|
||||
rm -rf __dist_docs
|
||||
cp -pr docs __dist_docs
|
||||
@ -94,8 +87,8 @@ rm -f __dist_docs/html/*.map __dist_docs/html/*.md5
|
||||
touch -r ChangeLog __dist_docs/html/*
|
||||
|
||||
|
||||
%check
|
||||
make check
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
@ -104,194 +97,31 @@ make check
|
||||
|
||||
|
||||
%files
|
||||
%license COPYRIGHT_W3C COPYING COPYRIGHT_URI
|
||||
%doc README NEWS README.dodsrc
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/getdap
|
||||
%{_bindir}/getdap4
|
||||
%{_libdir}/libdap.so.23*
|
||||
%{_libdir}/libdapclient.so.6*
|
||||
%{_libdir}/libdapserver.so.7*
|
||||
%{_mandir}/man1/getdap.1*
|
||||
%{_mandir}/man1/getdap4.1*
|
||||
%{_sbindir}/deflate
|
||||
%{_libdir}/libdap.so.*
|
||||
%{_libdir}/libdapclient.so.*
|
||||
%{_libdir}/libdapserver.so.*
|
||||
%doc README NEWS COPYING COPYRIGHT_URI README.AIS README.dodsrc
|
||||
%doc COPYRIGHT_W3C
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libdap.so
|
||||
%{_libdir}/libdapclient.so
|
||||
%{_libdir}/libdapserver.so
|
||||
%{_libdir}/libdap/
|
||||
%{_libdir}/pkgconfig/libdap*.pc
|
||||
%{_bindir}/dap-config
|
||||
%{_includedir}/libdap/
|
||||
%{_datadir}/aclocal/*
|
||||
%{_mandir}/man1/dap-config.1*
|
||||
|
||||
%files doc
|
||||
%license COPYING COPYRIGHT_URI COPYRIGHT_W3C
|
||||
%defattr(-,root,root,-)
|
||||
%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
|
||||
|
||||
* 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
|
||||
- Update to 3.10.2
|
||||
- Deflate is no longer shipped
|
||||
- Drop includes patch fixed upstream
|
||||
- Add license to doc sub-package
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.9.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Wed Jul 22 2009 Orion Poplawski <orion@cora.nwra.com> - 3.9.3-1
|
||||
- Update to 3.9.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
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Fri Sep 5 2008 Patrice Dumas <pertusus@free.fr> 3.8.2-1
|
||||
- update to 3.8.2
|
||||
|
||||
* Sun Mar 16 2008 Patrice Dumas <pertusus@free.fr> 3.8.0-1
|
||||
- update to 3.8.0
|
||||
|
||||
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 3.7.10-3
|
||||
- Autorebuild for GCC 4.3
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user