[votca-csg] Fix FTBFS.
Jussi Lehtola
jussilehtola at fedoraproject.org
Mon Jan 9 22:39:36 UTC 2012
commit cce353fd060f7505d1a7f36315d025f8779ead7e
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date: Tue Jan 10 00:39:27 2012 +0200
Fix FTBFS.
votca-csg-1.2.1-namespace.patch | 52 +++++++++++++++++++++++++++++++++++++++
votca-csg.spec | 8 +++++-
2 files changed, 59 insertions(+), 1 deletions(-)
---
diff --git a/votca-csg-1.2.1-namespace.patch b/votca-csg-1.2.1-namespace.patch
new file mode 100644
index 0000000..482eef4
--- /dev/null
+++ b/votca-csg-1.2.1-namespace.patch
@@ -0,0 +1,52 @@
+diff -up votca-csg-1.2.1/include/votca/csg/boundarycondition.h.orig votca-csg-1.2.1/include/votca/csg/boundarycondition.h
+--- votca-csg-1.2.1/include/votca/csg/boundarycondition.h.orig 2011-08-25 15:27:01.000000000 +0300
++++ votca-csg-1.2.1/include/votca/csg/boundarycondition.h 2012-01-10 00:31:43.375918416 +0200
+@@ -20,8 +20,8 @@
+
+ #include <votca/tools/matrix.h>
+
+-using namespace std;
+ namespace votca { namespace csg {
++using namespace std;
+ using namespace votca::tools;
+
+ class BoundaryCondition {
+diff -up votca-csg-1.2.1/include/votca/csg/openbox.h.orig votca-csg-1.2.1/include/votca/csg/openbox.h
+--- votca-csg-1.2.1/include/votca/csg/openbox.h.orig 2011-08-25 15:27:01.000000000 +0300
++++ votca-csg-1.2.1/include/votca/csg/openbox.h 2012-01-10 00:32:07.237578804 +0200
+@@ -20,8 +20,8 @@
+
+ #include "boundarycondition.h"
+
+-using namespace std;
+ namespace votca { namespace csg {
++using namespace std;
+ using namespace votca::tools;
+
+ class OpenBox : public BoundaryCondition {
+diff -up votca-csg-1.2.1/include/votca/csg/orthorhombicbox.h.orig votca-csg-1.2.1/include/votca/csg/orthorhombicbox.h
+--- votca-csg-1.2.1/include/votca/csg/orthorhombicbox.h.orig 2011-08-25 15:27:01.000000000 +0300
++++ votca-csg-1.2.1/include/votca/csg/orthorhombicbox.h 2012-01-10 00:32:24.583073548 +0200
+@@ -20,8 +20,8 @@
+
+ #include "boundarycondition.h"
+
+-using namespace std;
+ namespace votca { namespace csg {
++using namespace std;
+ using namespace votca::tools;
+
+ class OrthorhombicBox : public BoundaryCondition {
+diff -up votca-csg-1.2.1/include/votca/csg/triclinicbox.h.orig votca-csg-1.2.1/include/votca/csg/triclinicbox.h
+--- votca-csg-1.2.1/include/votca/csg/triclinicbox.h.orig 2011-08-25 15:27:01.000000000 +0300
++++ votca-csg-1.2.1/include/votca/csg/triclinicbox.h 2012-01-10 00:32:38.550471940 +0200
+@@ -20,8 +20,8 @@
+
+ #include "boundarycondition.h"
+
+-using namespace std;
+ namespace votca { namespace csg {
++using namespace std;
+ using namespace votca::tools;
+
+ class TriclinicBox : public BoundaryCondition {
diff --git a/votca-csg.spec b/votca-csg.spec
index 7cf1c00..87beee7 100644
--- a/votca-csg.spec
+++ b/votca-csg.spec
@@ -1,12 +1,14 @@
Name: votca-csg
Version: 1.2.1
-Release: 1%{?dist}.1
+Release: 2%{?dist}
Summary: VOTCA coarse-graining engine
Group: Applications/Engineering
License: ASL 2.0
URL: http://www.votca.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: http://votca.googlecode.com/files/%{name}-%{version}.tar.gz
+# Patch to get the program to compile
+Patch0: votca-csg-1.2.1-namespace.patch
BuildRequires: cmake
BuildRequires: doxygen
@@ -81,6 +83,7 @@ engine.
%prep
%setup -q
+%patch0 -p1
%build
mkdir %{_target_platform}
@@ -131,6 +134,9 @@ rm -rf %{buildroot}
%changelog
+* Tue Jan 10 2012 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.2.1-2
+- Fix FTBFS on rawhide.
+
* Wed Nov 23 2011 Jussi Lehtola <jussilehtola at fedoraproject.org> - 1.2.1-1.1
- Bump due to boost update.
More information about the scm-commits
mailing list