orion pushed to libdap (master). "Add patch to add needed includes"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Apr 18 01:54:19 UTC 2015
>From 8126ecaf2db20a1210e7b7c2573feffd3c1705d2 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion at cora.nwra.com>
Date: Fri, 17 Apr 2015 19:54:13 -0600
Subject: Add patch to add needed includes
diff --git a/libdap-include.patch b/libdap-include.patch
new file mode 100644
index 0000000..e651c50
--- /dev/null
+++ b/libdap-include.patch
@@ -0,0 +1,24 @@
+diff -up libdap-3.14.0/media_types.h.include libdap-3.14.0/media_types.h
+--- libdap-3.14.0/media_types.h.include 2015-02-12 20:16:20.000000000 -0700
++++ libdap-3.14.0/media_types.h 2015-04-17 19:35:06.752767086 -0600
+@@ -26,6 +26,8 @@
+ #ifndef MEDIA_TYPES_H_
+ #define MEDIA_TYPES_H_
+
++#include <string>
++
+ static std::string DAS1 = "dods_das";
+ static std::string DAS2 = "dods-das";
+
+diff -up libdap-3.14.0/mime_util.h.include libdap-3.14.0/mime_util.h
+--- libdap-3.14.0/mime_util.h.include 2015-02-12 20:16:20.000000000 -0700
++++ libdap-3.14.0/mime_util.h 2015-04-17 19:36:40.586900129 -0600
+@@ -47,6 +47,8 @@
+ #include "EncodingType.h"
+ #endif
+
++#include <string>
++
+ namespace libdap
+ {
+
diff --git a/libdap.spec b/libdap.spec
index e610bfe..c389618 100644
--- a/libdap.spec
+++ b/libdap.spec
@@ -13,6 +13,8 @@ Patch0: libdap-offline.patch
Patch1: libdap-flex.patch
# Fix getopt()
Patch2: libdap-getopt.patch
+# Add needed includes
+Patch3: libdap-include.patch
# For autoreconf
BuildRequires: libtool
@@ -71,6 +73,7 @@ Documentation of the libdap library.
%patch0 -p1 -b .offline
%patch1 -p1 -b .flex
%patch2 -p1 -b .getopt
+%patch3 -p1 -b .include
iconv -f latin1 -t utf8 < COPYRIGHT_W3C > COPYRIGHT_W3C.utf8
touch -r COPYRIGHT_W3C COPYRIGHT_W3C.utf8
mv COPYRIGHT_W3C.utf8 COPYRIGHT_W3C
@@ -143,6 +146,9 @@ make check
%changelog
+* Fri Apr 17 2015 Orion Poplawski <orion at cora.nwra.com> - 3.14.0-3
+- Add patch to add needed includes
+
* Fri Apr 17 2015 Orion Poplawski <orion at cora.nwra.com> - 3.14.0-2
- Ship libtest-types.a for dependent package tests
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/libdap.git/commit/?h=master&id=8126ecaf2db20a1210e7b7c2573feffd3c1705d2
More information about the scm-commits
mailing list