From 3fcd25500ba665fd2b867e2ed23806a9ce7c8200 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <rpm@greysector.net>
Date: Feb 22 2016 00:46:57 +0000
Subject: Rebuild for openbabel


- Fix build (gcc-6/Qt?)

---

diff --git a/avogadro-1.1.1-qt.patch b/avogadro-1.1.1-qt.patch
new file mode 100644
index 0000000..7c3ac7c
--- /dev/null
+++ b/avogadro-1.1.1-qt.patch
@@ -0,0 +1,21 @@
+diff -up avogadro-1.1.1/libavogadro/tests/moleculefiletest.cpp.qt avogadro-1.1.1/libavogadro/tests/moleculefiletest.cpp
+--- avogadro-1.1.1/libavogadro/tests/moleculefiletest.cpp.qt	2013-12-06 16:50:04.000000000 +0100
++++ avogadro-1.1.1/libavogadro/tests/moleculefiletest.cpp	2016-02-21 23:54:57.391691551 +0100
+@@ -151,7 +151,7 @@ void MoleculeFileTest::readFile()
+   OBConversion conv;
+   conv.SetOutFormat("sdf");
+   std::ofstream ofs(filename.toAscii().data());
+-  QVERIFY( ofs );
++  QVERIFY( ofs.good() );
+   // write the molecule 4 times...
+   conv.Write(&mol, &ofs);
+   conv.Write(&mol, &ofs);
+@@ -171,7 +171,7 @@ void MoleculeFileTest::readFile()
+ 
+ 
+   ofs.open(filename.toAscii().data());
+-  QVERIFY( ofs );
++  QVERIFY( ofs.good() );
+   // write the molecule 4 times...
+   conv.Write(&mol, &ofs);
+   conv.Write(&mol, &ofs);
diff --git a/avogadro.spec b/avogadro.spec
index 5696c5f..165f93d 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -4,7 +4,7 @@
 
 Name:           avogadro
 Version:        1.1.1
-Release:        17%{?dist}
+Release:        18%{?dist}
 Summary:        An advanced molecular editor for chemical purposes
 
 License:        GPLv2
@@ -38,6 +38,9 @@ Patch12:        avogadro-1.1.1-Q_MOC_RUN.patch
 # fix build (with recent swig/linker/python?)
 Patch13:        avogadro-1.1.1-python_openbabel.patch
 
+# fix build with recent Qt
+Patch14:        avogadro-1.1.1-qt.patch
+
 BuildRequires:  boost-devel >= 1.35
 BuildRequires:  cmake >= 2.6.0
 BuildRequires:  desktop-file-utils
@@ -87,6 +90,7 @@ Avogadro libraries.
 %patch11 -p1 -b .eigen3
 %patch12 -p1 -b .Q_MOC_RUN
 %patch13 -p1 -b .python_openbabel
+%patch14 -p1 -b .qt
 
 
 %build
@@ -157,6 +161,10 @@ xvfb-run -a dbus-launch --exit-with-session make test ARGS="--output-on-failure"
 
 
 %changelog
+* Sat Feb 20 2016 Dominik Mierzejewski <rpm@greysector.net> - 1.1.1-18
+- Rebuild for openbabel
+- Fix build (gcc-6/Qt?)
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.1-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild