Add patch to compile with gcc 4.7
This commit is contained in:
parent
b0a5ee2cfe
commit
2920d46f39
11
libdap-gcc47.patch
Normal file
11
libdap-gcc47.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
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
|
@ -1,7 +1,7 @@
|
|||||||
Name: libdap
|
Name: libdap
|
||||||
Summary: The C++ DAP2 library from OPeNDAP
|
Summary: The C++ DAP2 library from OPeNDAP
|
||||||
Version: 3.11.1
|
Version: 3.11.1
|
||||||
Release: 3%{?dist}
|
Release: 4%{?dist}
|
||||||
|
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
@ -13,6 +13,8 @@ Patch0: libdap-3.10.2-offline.patch
|
|||||||
Patch1: libdap-curl.patch
|
Patch1: libdap-curl.patch
|
||||||
# Upsteam patch to test output to fix failing test
|
# Upsteam patch to test output to fix failing test
|
||||||
Patch2: libdap-test.patch
|
Patch2: libdap-test.patch
|
||||||
|
# Compile with gcc 4.7
|
||||||
|
Patch3: libdap-gcc47.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
@ -65,6 +67,7 @@ Documentation of the libdap library.
|
|||||||
%patch0 -p1 -b .offline
|
%patch0 -p1 -b .offline
|
||||||
%patch1 -p1 -b .curl
|
%patch1 -p1 -b .curl
|
||||||
%patch2 -p1 -b .test
|
%patch2 -p1 -b .test
|
||||||
|
%patch3 -p1 -b .gcc47
|
||||||
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
|
||||||
@ -130,6 +133,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* 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
|
* 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
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user