rpms/avogadro
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 1.1.1 [release 1.1.1-1mamba;Sat Jun 14 2014]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 20:43:00 +01:00
parent a80423387d
commit 641cb815a5
2 changed files with 100 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
avogadro-1.1.1-boost-1.5.5.patch Normal file
View File

@ -0,0 +1,78 @@
diff -ru avogadro-1.1.1/libavogadro/src/pythonengine_p.h avogadro-1.1.1.patched/libavogadro/src/pythonengine_p.h
--- avogadro-1.1.1/libavogadro/src/pythonengine_p.h 2013-12-06 16:50:04.000000000 +0100
+++ avogadro-1.1.1.patched/libavogadro/src/pythonengine_p.h 2014-06-14 13:24:44.906052644 +0200
@@ -27,7 +27,9 @@
#include <avogadro/global.h>
#include <avogadro/engine.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
namespace Avogadro {
diff -ru avogadro-1.1.1/libavogadro/src/pythonextension_p.h avogadro-1.1.1.patched/libavogadro/src/pythonextension_p.h
--- avogadro-1.1.1/libavogadro/src/pythonextension_p.h 2013-12-06 16:50:04.000000000 +0100
+++ avogadro-1.1.1.patched/libavogadro/src/pythonextension_p.h 2014-06-14 13:26:29.510072837 +0200
@@ -29,7 +29,9 @@
#include <avogadro/extension.h>
#include <avogadro/primitive.h>
#include <avogadro/glwidget.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
#include <QWidget>
#include <QList>
diff -ru avogadro-1.1.1/libavogadro/src/pythoninterpreter.h avogadro-1.1.1.patched/libavogadro/src/pythoninterpreter.h
--- avogadro-1.1.1/libavogadro/src/pythoninterpreter.h 2013-12-06 16:50:04.000000000 +0100
+++ avogadro-1.1.1.patched/libavogadro/src/pythoninterpreter.h 2014-06-14 13:27:34.316085348 +0200
@@ -26,7 +26,9 @@
#define PYTHONINTERPRETER_H
#include <avogadro/global.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
#include <avogadro/primitive.h>
#include <QString>
diff -ru avogadro-1.1.1/libavogadro/src/pythonscript.h avogadro-1.1.1.patched/libavogadro/src/pythonscript.h
--- avogadro-1.1.1/libavogadro/src/pythonscript.h 2013-12-06 16:50:04.000000000 +0100
+++ avogadro-1.1.1.patched/libavogadro/src/pythonscript.h 2014-06-14 13:27:49.010088184 +0200
@@ -27,7 +27,9 @@
#define PYTHONSCRIPT_H
#include <avogadro/global.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
#include "pythonerror.h"
diff -ru avogadro-1.1.1/libavogadro/src/pythonthread_p.h avogadro-1.1.1.patched/libavogadro/src/pythonthread_p.h
--- avogadro-1.1.1/libavogadro/src/pythonthread_p.h 2013-12-06 16:50:04.000000000 +0100
+++ avogadro-1.1.1.patched/libavogadro/src/pythonthread_p.h 2014-06-14 13:28:08.114091872 +0200
@@ -26,7 +26,9 @@
#define PYTHONTHREAD_H
#include <avogadro/global.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
namespace Avogadro {
diff -ru avogadro-1.1.1/libavogadro/src/pythontool_p.h avogadro-1.1.1.patched/libavogadro/src/pythontool_p.h
--- avogadro-1.1.1/libavogadro/src/pythontool_p.h 2013-12-06 16:50:04.000000000 +0100
+++ avogadro-1.1.1.patched/libavogadro/src/pythontool_p.h 2014-06-14 13:28:40.003098028 +0200
@@ -27,7 +27,9 @@
#include <avogadro/global.h>
#include <avogadro/tool.h>
+#ifndef Q_MOC_RUN
#include <boost/python.hpp>
+#endif
#include <QObject>
#include <QAction>

33
avogadro.spec
View File

@ -1,5 +1,5 @@
Name: avogadro
Version: 1.1.0
Version: 1.1.1
Release: 1mamba
Summary: An advanced molecule editor and visualizer
Group: Graphical Desktop/Applications/Scientific
@ -8,25 +8,29 @@ Distribution: openmamba
Packager: Davide Madrisan <davide.madrisan@gmail.com>
URL: http://avogadro.openmolecules.net
Source: http://downloads.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
Patch0: avogadro-1.1.1-boost-1.5.5.patch
License: GPL
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
BuildRequires: libgcc
BuildRequires: libGL-devel
BuildRequires: libglew-devel
BuildRequires: libGLU-devel
BuildRequires: libICE-devel
BuildRequires: libpython-devel
BuildRequires: libqt4-devel
BuildRequires: libSM-devel
BuildRequires: libstdc++6-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
BuildRequires: libgcc
BuildRequires: libglew-devel
BuildRequires: libpython-devel
BuildRequires: libpython27-devel
BuildRequires: libqt4-devel
BuildRequires: libstdc++6-devel
BuildRequires: libz-devel
BuildRequires: openbabel-devel
BuildRequires: python-boost-devel
## AUTOBUILDREQ-END
BuildRequires: python-sip-devel
BuildRequires: libeigen2-devel
BuildRequires: eigen3-devel
Requires: python-numpy
Requires: libavogadro = %{?epoch:%epoch:}%{version}-%{release}
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@ -52,16 +56,20 @@ Group: System/Libraries
%prep
%setup -q
# use working version included in cmake
rm -f cmake/modules/FindPythonLibs.cmake
%patch0 -p1
## use working version included in cmake
#rm -f cmake/modules/FindPythonLibs.cmake
%build
%cmake -d build \
-DENABLE_GLSL:BOOL=ON \
-DENABLE_PYTHON:BOOL=ON \
-DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python_version}.so \
-DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python_version} \
-DSIP_INCLUDE_DIR=%{_includedir}/python%{python_version}
-DEIGEN2_INCLUDE_DIR=%{_includedir}/eigen2 \
-DEIGEN3_INCLUDE_DIR=%{_includedir}/eigen3
# -DPYTHON_LIBRARY:FILEPATH=%{_libdir}/libpython%{python_version}.so \
# -DPYTHON_INCLUDE_DIR:PATH=%{_includedir}/python%{python_version} \
# -DSIP_INCLUDE_DIR=%{_includedir}/python%{python_version}
%make
@ -124,6 +132,9 @@ mv %{buildroot}%{_prefix}/features/avogadro.prf \
#%doc AUTHORS COPYING
%changelog
* Sat Jun 14 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.1.1-1mamba
- update to 1.1.1
* Sun Dec 02 2012 Automatic Build System <autodist@mambasoft.it> 1.1.0-1mamba
- update to 1.1.0