From 84b0a9094b174f00f27f7b10799bad0efd471d231f18b4b36d3b48e0e173618e Mon Sep 17 00:00:00 2001 From: Atri Bhattacharya Date: Wed, 28 Jun 2017 12:54:46 +0000 Subject: [PATCH] Accepting request 506113 from home:badshah400:branches:science - Add cadabra2-include-functional-header.patch: Explicitly include the header in core/Functional.hh to fix building on openSUSE > 1320; apply without conditionals as it doesn't hurt to have this generally. OBS-URL: https://build.opensuse.org/request/show/506113 OBS-URL: https://build.opensuse.org/package/show/science/cadabra2?expand=0&rev=2 --- cadabra2-include-functional-header.patch | 12 ++++++++++++ cadabra2.changes | 8 ++++++++ cadabra2.spec | 3 +++ 3 files changed, 23 insertions(+) create mode 100644 cadabra2-include-functional-header.patch diff --git a/cadabra2-include-functional-header.patch b/cadabra2-include-functional-header.patch new file mode 100644 index 0000000..ffbd216 --- /dev/null +++ b/cadabra2-include-functional-header.patch @@ -0,0 +1,12 @@ +Index: cadabra2-2.1.4/core/Functional.hh +=================================================================== +--- cadabra2-2.1.4.orig/core/Functional.hh ++++ cadabra2-2.1.4/core/Functional.hh +@@ -1,6 +1,7 @@ + + #pragma once + ++#include + #include "Storage.hh" + + namespace cadabra { diff --git a/cadabra2.changes b/cadabra2.changes index 2e5fd35..49846a8 100644 --- a/cadabra2.changes +++ b/cadabra2.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Jun 25 11:26:09 UTC 2017 - badshah400@gmail.com + +- Add cadabra2-include-functional-header.patch: Explicitly include + the header in core/Functional.hh to fix building on + openSUSE > 1320; apply without conditionals as it doesn't hurt + to have this generally. + ------------------------------------------------------------------- Sun Apr 23 12:14:41 UTC 2017 - badshah400@gmail.com diff --git a/cadabra2.spec b/cadabra2.spec index 1f6d83e..83303cf 100644 --- a/cadabra2.spec +++ b/cadabra2.spec @@ -27,6 +27,8 @@ Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz Source1: %{name}-rpmlintrc # PATCH-FIX-UPSTREAM cadabra2-cmake-error.patch badshah400@gmail.com -- Cmake needs to call "execute_process" instead of "execute"; fixes build failures Patch0: cadabra2-cmake-error.patch +# PATCH-FIX-UPSTREAM cadabra2-include-functional-header.patch badshah400@gmail.com -- Explicitly include the header in core/Functional.hh to fix building on openSUSE > 1320; apply without conditionals as it doesn't hurt to have this generally +Patch1: cadabra2-include-functional-header.patch BuildRequires: cmake BuildRequires: doxygen BuildRequires: gcc-c++ @@ -162,6 +164,7 @@ This package provides documentation in the form of a PDF file for %{name}. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build mkdir build && pushd build