Accepting request 506113 from home:badshah400:branches:science

- Add cadabra2-include-functional-header.patch: Explicitly include
  the <functional> 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
This commit is contained in:
Atri Bhattacharya 2017-06-28 12:54:46 +00:00 committed by Git OBS Bridge
parent 1861c7a451
commit 84b0a9094b
3 changed files with 23 additions and 0 deletions

View File

@ -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 <functional>
#include "Storage.hh"
namespace cadabra {

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Jun 25 11:26:09 UTC 2017 - badshah400@gmail.com
- Add cadabra2-include-functional-header.patch: Explicitly include
the <functional> 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 Sun Apr 23 12:14:41 UTC 2017 - badshah400@gmail.com

View File

@ -27,6 +27,8 @@ Source0: https://github.com/kpeeters/cadabra2/archive/%{version}.tar.gz
Source1: %{name}-rpmlintrc 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 # 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 Patch0: cadabra2-cmake-error.patch
# PATCH-FIX-UPSTREAM cadabra2-include-functional-header.patch badshah400@gmail.com -- Explicitly include the <functional> 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: cmake
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -162,6 +164,7 @@ This package provides documentation in the form of a PDF file for %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
mkdir build && pushd build mkdir build && pushd build