From 6d22f23a8e87b6b5f416bca3339c2334b488581f Mon Sep 17 00:00:00 2001 From: Sebastian Held Date: Mon, 18 Jun 2012 13:13:31 +0200 Subject: [PATCH] Fedora 17 compile fixes --- linux/fedora17.diff | 13 +++++++++++++ linux/openEMS.spec | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 linux/fedora17.diff diff --git a/linux/fedora17.diff b/linux/fedora17.diff new file mode 100644 index 0000000..12b1b41 --- /dev/null +++ b/linux/fedora17.diff @@ -0,0 +1,13 @@ +diff --git a/openEMS.pro b/openEMS.pro +index 97b0632..b9c3cf7 100644 +--- a/openEMS.pro ++++ b/openEMS.pro +@@ -68,7 +68,7 @@ win32 { + /usr/include/vtk-5.10 \ + /usr/include/vtk + INCLUDEPATH += /usr/include/CSXCAD +- LIBS += -lvtkCommon \ ++ LIBS += -L/usr/lib/vtk -L/usr/lib64/vtk -lvtkCommon \ + -lvtkIO \ + -lvtksys \ + -lvtkFiltering diff --git a/linux/openEMS.spec b/linux/openEMS.spec index 4537722..105db5b 100644 --- a/linux/openEMS.spec +++ b/linux/openEMS.spec @@ -19,7 +19,7 @@ Name: openEMS Version: 0.0.28 -Release: 1 +Release: 2 Summary: Free and Open Electromagnetic Field Solver Group: Productivity/Scientific/Physics License: GPLv3 @@ -28,6 +28,7 @@ Source0: %{name}-%{version}.tar.bz2 Patch0: invoke_openEMS.m.patch Patch1: README.patch Patch2: CalcNF2FF.m.patch +Patch3: fedora17.diff BuildRoot: %_tmppath/%name-%version-build # libqt4-devel is needed only to provide qmake (the Qt-libraries are not used) @@ -56,6 +57,9 @@ OpenEMS is a free and open-source electromagnetic field solver using the (EC-)FD #%endif %patch1 -p1 %patch2 -p1 +%if 0%{?fedora} >= 17 +%patch3 -p1 +%endif %build ADDFLAGS="-msse" # enable at least the SSE command set (no SSE makes no sense -- way too slow) @@ -87,6 +91,8 @@ rm -rf %{buildroot} %changelog +* Mon Jun 18 2012 Sebastian Held - 0.0.28-2 +- Fedora 17 build fixes * Sun Jun 17 2012 Sebastian Held - 0.0.28-1 - new upstream version * Thu Mar 1 2012 Sebastian Held - 0.0.27-1