From 2b0b5e7550f72870849dc38458ef3c765068ed34 Mon Sep 17 00:00:00 2001
From: Sandro Mani <manisandro@gmail.com>
Date: Dec 28 2016 20:09:24 +0000
Subject: Build against eigen2


---

diff --git a/avogadro-1.1.1-pkgconfig_eigen.patch b/avogadro-1.1.1-pkgconfig_eigen.patch
index 93dbe2f..a5b2af4 100644
--- a/avogadro-1.1.1-pkgconfig_eigen.patch
+++ b/avogadro-1.1.1-pkgconfig_eigen.patch
@@ -5,4 +5,4 @@ diff -up avogadro-1.1.1/avogadro.pc.in.eigen avogadro-1.1.1/avogadro.pc.in
  Version: @Avogadro_VERSION_FULL@
  Libs: -L${libdir} -lavogadro
  Cflags: -I${pkgincludedir}
-+Requires.private: eigen3
++Requires.private: eigen2
diff --git a/avogadro-1.2.0-eigen3.patch b/avogadro-1.2.0-eigen3.patch
deleted file mode 100644
index a78d58a..0000000
--- a/avogadro-1.2.0-eigen3.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- avogadro-1.2.0/CMakeLists.txt.omv~	2014-01-30 13:58:22.999443609 +0100
-+++ avogadro-1.2.0/CMakeLists.txt	2014-01-30 13:59:31.086106925 +0100
-@@ -231,13 +231,15 @@
-   message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations")
- endif()
- 
--find_package(Eigen3) # find and setup Eigen3 if available
-+find_package(Eigen3 REQUIRED) # find and setup Eigen3 if available
- if(NOT EIGEN3_FOUND)
-    message(STATUS "Cannot find Eigen3, trying Eigen2")
--   find_package(Eigen2 REQUIRED) # Some version is required
-+   find_package(Eigen2) # Some version is required
- else()
- # Use Stage10 Eigen3 support
-    set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE)
-+   add_definitions (-DEIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API)
-+   set (EIGEN2_INCLUDE_DIR ${EIGEN3_INCLUDE_DIR})
- endif()
- 
- find_package(ZLIB REQUIRED)
---- avogadro-1.2.0/libavogadro/src/extensions/qtaim/CMakeLists.txt.omv~	2014-01-30 14:12:33.859401753 +0100
-+++ avogadro-1.2.0/libavogadro/src/extensions/qtaim/CMakeLists.txt	2014-01-30 14:15:07.652727522 +0100
-@@ -4,6 +4,8 @@
- set(PLUGIN_LABEL extensions)
- set(PLUGIN_TARGET extensions)
- 
-+add_definitions(-DEIGEN2_SUPPORT_STAGE20_RESOLVE_API_CONFLICTS -std=gnu++11)
-+
- set(qtaimextension_SRCS
-     qtaimextension.cpp
- #    qtaimdialog.cpp
---- avogadro-1.2.0/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt.omv~	2014-01-30 13:59:05.889441500 +0100
-+++ avogadro-1.2.0/libavogadro/src/extensions/surfaces/openqube/CMakeLists.txt	2014-01-30 13:59:08.832774688 +0100
-@@ -2,7 +2,7 @@
- find_package(Eigen3)
- if(NOT EIGEN3_FOUND)
-   message(STATUS "Cannot find Eigen3, trying Eigen2")
--  find_package(Eigen2 REQUIRED)
-+  find_package(Eigen3 REQUIRED)
- else()
-   set (EIGEN2_SUPPORT_STAGE10_FULL_EIGEN2_API TRUE)
- endif()
---- avogadro-1.2.0/cmake/modules/AvogadroUse.cmake.orig	2014-10-13 20:13:59.909828034 +0100
-+++ avogadro-1.2.0/cmake/modules/AvogadroUse.cmake	2014-10-13 20:15:09.492822908 +0100
-@@ -20,7 +20,7 @@
- # If Eigen3 wasn't found, find Eigen2. It will be required.
- else(EIGEN3_FOUND)
-   message("Eigen3 not found. Trying to find Eigen2...")
--  find_package(Eigen2 REQUIRED)
-+  find_package(Eigen3 REQUIRED)
-   include_directories(${EIGEN2_INCLUDE_DIR})
- endif(EIGEN3_FOUND)
- 
diff --git a/avogadro.spec b/avogadro.spec
index fc5135a..7006b92 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -2,7 +2,7 @@
 
 Name:           avogadro
 Version:        1.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 License:        GPLv2
@@ -23,10 +23,6 @@ Patch2:         %{name}-1.1.1-pkgconfig_eigen.patch
 # https://sourceforge.net/p/avogadro/bugs/746/
 Patch10:        %{name}-cmake-3.2.patch
 
-# fix Eigen3 support, from OpenMandriva (Bernhard Rosenkränzer, Crispin Boylan)
-# disables Eigen2 support, so probably not upstreamable as is
-Patch11:        %{name}-1.2.0-eigen3.patch
-
 # fix build with recent boost
 Patch12:        %{name}-1.1.1-Q_MOC_RUN.patch
 
@@ -91,7 +87,6 @@ Language packs for Avogadro.
 %patch1 -p1 -b .no-strip
 %patch2 -p1 -b .pkgconfig_eigen
 %patch10 -p1 -b .cmake_x11
-%patch11 -p1 -b .eigen3
 %patch12 -p1 -b .Q_MOC_RUN
 %patch13 -p1 -b .python_openbabel
 %patch14 -p1 -b .qt
@@ -184,6 +179,9 @@ xvfb-run -a dbus-launch --exit-with-session make test ARGS="--output-on-failure"
 %{_datadir}/avogadro/i18n/
 
 %changelog
+* Thu Dec 22 2016 Sandro Mani <manisandro@gmail.com> - 1.2.0-3
+- Build against eigen2 (upstream does not support eigen3 >= 3.3.0)
+
 * Fri Oct 14 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.2.0-2
 - rebuild for openbabel-2.4.1