diff --git a/avogadro-1.1.1-pkgconfig_eigen.patch b/avogadro-1.1.1-pkgconfig_eigen.patch deleted file mode 100644 index a5b2af4..0000000 --- a/avogadro-1.1.1-pkgconfig_eigen.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff -up avogadro-1.1.1/avogadro.pc.in.eigen avogadro-1.1.1/avogadro.pc.in ---- avogadro-1.1.1/avogadro.pc.in.eigen 2013-12-06 09:50:04.000000000 -0600 -+++ avogadro-1.1.1/avogadro.pc.in 2014-01-25 00:37:45.732007852 -0600 -@@ -9,3 +9,4 @@ Description: Avogadro libraries - Version: @Avogadro_VERSION_FULL@ - Libs: -L${libdir} -lavogadro - Cflags: -I${pkgincludedir} -+Requires.private: eigen2 diff --git a/avogadro-1.2.0-pkgconfig_eigen.patch b/avogadro-1.2.0-pkgconfig_eigen.patch new file mode 100644 index 0000000..a5b2af4 --- /dev/null +++ b/avogadro-1.2.0-pkgconfig_eigen.patch @@ -0,0 +1,8 @@ +diff -up avogadro-1.1.1/avogadro.pc.in.eigen avogadro-1.1.1/avogadro.pc.in +--- avogadro-1.1.1/avogadro.pc.in.eigen 2013-12-06 09:50:04.000000000 -0600 ++++ avogadro-1.1.1/avogadro.pc.in 2014-01-25 00:37:45.732007852 -0600 +@@ -9,3 +9,4 @@ Description: Avogadro libraries + Version: @Avogadro_VERSION_FULL@ + Libs: -L${libdir} -lavogadro + Cflags: -I${pkgincludedir} ++Requires.private: eigen2 diff --git a/avogadro.spec b/avogadro.spec index 5ee068d..c890ea0 100644 --- a/avogadro.spec +++ b/avogadro.spec @@ -16,7 +16,7 @@ Patch0: %{name}-1.1.1-mkspecs-dir.patch # Remove -Wl,-s from the compiler flags, fixes -debuginfo (#700080) Patch1: %{name}-1.1.1-no-strip.patch # avogadro.pc missing eigen dependency -Patch2: %{name}-1.1.1-pkgconfig_eigen.patch +Patch2: %{name}-1.2.0-pkgconfig_eigen.patch ## upstreamable # fix build with cmake-3.2+ @@ -40,7 +40,7 @@ BuildRequires: desktop-file-utils BuildRequires: docbook-utils BuildRequires: numpy, gcc-c++ BuildRequires: python2-devel -BuildRequires: pkgconfig(eigen3) +BuildRequires: pkgconfig(eigen2) BuildRequires: pkgconfig(glew) >= 1.5.0 BuildRequires: pkgconfig(openbabel-2.0) >= 2.2.2 BuildRequires: pkgconfig(QtGui) pkgconfig(QtNetwork) pkgconfig(QtOpenGL) @@ -90,6 +90,7 @@ Language packs for Avogadro. %patch12 -p1 -b .Q_MOC_RUN %patch13 -p1 -b .python_openbabel %patch14 -p1 -b .qt +%patch15 -p1 -b .libmsymfloat ## Remove spurious executable permissions for i in `find . -perm /755 -type f \( -name "*.cpp" -o -name "*.h" -o -name "*.c" \)`; do @@ -99,7 +100,7 @@ done %build mkdir build && pushd build export LDFLAGS="%{__global_ldflags} -lm -Wl,--as-needed" -export CXXFLAGS="%{optflags} -I$PWD/libavogadro/src -I%{_includedir}/eigen3" +export CXXFLAGS="%{optflags} -I$PWD/libavogadro/src" %cmake -DCMAKE_BUILD_TYPE:STRING=Release \ -Wno-dev \ %{?ENABLE_TESTS} \ @@ -165,7 +166,7 @@ xvfb-run -a dbus-launch --exit-with-session make test ARGS="--output-on-failure" %{_qt4_prefix}/mkspecs/features/avogadro.prf %files libs -f libavogadro.lang -%doc AUTHORS README.md +%doc AUTHORS README %license COPYING %{python2_sitearch}/Avogadro.so %{_datadir}/libavogadro/