- Update to 3.11.7
- Drop gcc47 patch applied upstream - spec cleanup
This commit is contained in:
parent
4354e1a092
commit
7b17a045cc
|
@ -2,3 +2,4 @@ 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
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
diff -up libdap-3.11.1/ResponseBuilder.cc.gcc47 libdap-3.11.1/ResponseBuilder.cc
|
||||
--- libdap-3.11.1/ResponseBuilder.cc.gcc47 2011-04-29 07:19:43.000000000 -0600
|
||||
+++ libdap-3.11.1/ResponseBuilder.cc 2012-01-14 08:50:16.434627257 -0700
|
||||
@@ -27,6 +27,7 @@
|
||||
static char rcsid[] not_used = { "$Id: ResponseBuilder.cc 23477 2010-09-02 21:02:59Z jimg $" };
|
||||
|
||||
#include <signal.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
#ifndef WIN32
|
||||
// #include <unistd.h> // for getopt
|
21
libdap.spec
21
libdap.spec
|
@ -1,7 +1,7 @@
|
|||
Name: libdap
|
||||
Summary: The C++ DAP2 library from OPeNDAP
|
||||
Version: 3.11.3
|
||||
Release: 3%{?dist}
|
||||
Version: 3.11.7
|
||||
Release: 1%{?dist}
|
||||
|
||||
License: LGPLv2+
|
||||
Group: Development/Libraries
|
||||
|
@ -9,10 +9,6 @@ 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-3.10.2-offline.patch
|
||||
# Compile with gcc 4.7
|
||||
Patch3: libdap-gcc47.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: cppunit-devel
|
||||
BuildRequires: curl-devel
|
||||
|
@ -63,7 +59,6 @@ Documentation of the libdap library.
|
|||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .offline
|
||||
%patch3 -p1 -b .gcc47
|
||||
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
|
||||
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
|
||||
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
|
||||
|
@ -77,7 +72,6 @@ make docs
|
|||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{__install} -p"
|
||||
rm $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
mv $RPM_BUILD_ROOT%{_bindir}/dap-config-pkgconfig $RPM_BUILD_ROOT%{_bindir}/dap-config
|
||||
|
@ -94,9 +88,6 @@ touch -r ChangeLog __dist_docs/html/*
|
|||
%check
|
||||
make check
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%post -p /sbin/ldconfig
|
||||
|
||||
|
@ -104,7 +95,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%{_bindir}/getdap
|
||||
%{_libdir}/libdap.so.*
|
||||
%{_libdir}/libdapclient.so.*
|
||||
|
@ -114,7 +104,6 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%doc COPYRIGHT_W3C
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root,-)
|
||||
%{_libdir}/libdap.so
|
||||
%{_libdir}/libdapclient.so
|
||||
%{_libdir}/libdapserver.so
|
||||
|
@ -125,12 +114,16 @@ rm -rf $RPM_BUILD_ROOT
|
|||
%{_mandir}/man1/dap-config.1*
|
||||
|
||||
%files doc
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING COPYRIGHT_URI COPYRIGHT_W3C
|
||||
%doc __dist_docs/html/
|
||||
|
||||
|
||||
%changelog
|
||||
* 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
|
||||
|
||||
* 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
|
||||
|
||||
|
|
Loading…
Reference in New Issue