[packages/openbabel] - up to 2.4.1

[baggins]

commit 06c68e4247092a025ca0a1e34b7fb1fa8abf62cb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Jun 19 20:57:12 2017 +0200

    - up to 2.4.1

 gcc6.patch      | 11 +++++++++++
 openbabel.spec  | 16 ++++++++--------
 swig-java.patch | 40 ----------------------------------------
 3 files changed, 19 insertions(+), 48 deletions(-)
---
diff --git a/openbabel.spec b/openbabel.spec
index e08d372..e2dba34 100644
--- a/openbabel.spec
+++ b/openbabel.spec
@@ -5,21 +5,21 @@
 %bcond_without	java	# Java/JNI bindings
 %bcond_with	mono	# .NET/C# bindings
 #
-%define	snap	2d45874
+%define	gitver	openbabel-2-4-1
 Summary:	A cross-platform chemistry program and library designed to convert file formats
 Summary(pl.UTF-8):	Międzyplatformowy program chemiczny i biblioteka do konwersji formatów plików
 Name:		openbabel
-Version:	2.3.90
-Release:	7
+Version:	2.4.1
+Release:	1
 License:	GPL v2
 Group:		Libraries
-Source0:	https://github.com/openbabel/openbabel/archive/%{snap}/%{name}-%{version}-%{snap}.tar.gz
-# Source0-md5:	32f083d63a0a17f1871a831edad3a912
+Source0:	https://github.com/openbabel/openbabel/archive/%{gitver}/%{name}-%{version}.tar.gz
+# Source0-md5:	c0e0aefeef0f9f2bb2c78109d65c30a5
 Patch0:		%{name}-prefix.patch
 Patch1:		perl-x32.patch
 Patch2:		perl-install.patch
 Patch3:		ruby-install.patch
-Patch4:		swig-java.patch
+Patch4:		gcc6.patch
 Patch5:		plugindir.patch
 URL:		http://openbabel.sourceforge.net/
 BuildRequires:	cairo-devel
@@ -129,7 +129,7 @@ Wiązanie języka Ruby do biblioteki OpenBabel.
 
 %prep
 %setup -q -c
-%{__mv} %{name}-%{snap}*/* ./
+%{__mv} %{name}-%{gitver}*/* ./
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -204,7 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/obthermo
 %attr(755,root,root) %{_bindir}/roundtrip
 %attr(755,root,root) %{_libdir}/libopenbabel.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libopenbabel.so.4
+%attr(755,root,root) %ghost %{_libdir}/libopenbabel.so.5
 %dir %{_libdir}/openbabel
 %dir %{_libdir}/openbabel/%{version}
 %attr(755,root,root) %{_libdir}/openbabel/%{version}/*.so
diff --git a/gcc6.patch b/gcc6.patch
new file mode 100644
index 0000000..7dc7b61
--- /dev/null
+++ b/gcc6.patch
@@ -0,0 +1,11 @@
+--- openbabel-2.4.1/CMakeLists.txt~	2017-06-19 20:19:34.000000000 +0200
++++ openbabel-2.4.1/CMakeLists.txt	2017-06-19 20:23:41.616726458 +0200
+@@ -239,7 +239,7 @@
+ # Get the GCC version - from KDE4 cmake files
+ if(CMAKE_COMPILER_IS_GNUCXX)
+   exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE _gcc_version_info)
+-  string(REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++  string(REGEX MATCH "[3456]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+   # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+   # patch level, handle this here:
+   if (NOT _gcc_version)
diff --git a/swig-java.patch b/swig-java.patch
deleted file mode 100644
index d786fcd..0000000
--- a/swig-java.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- openbabel-2.3.90/scripts/openbabel-java.i.orig	2015-09-22 12:38:01.000000000 +0200
-+++ openbabel-2.3.90/scripts/openbabel-java.i	2015-11-16 19:43:52.950908988 +0100
-@@ -233,7 +233,6 @@
- %warnfilter(516) OpenBabel::SpaceGroup; // Ignoring std::string methods in favour of char* ones
- %include <openbabel/math/spacegroup.h>
- 
--# CloneData should be used instead of the following method
- %ignore OpenBabel::OBBase::SetData;
- %ignore OpenBabel::OBBase::GetData(char const *);
- %ignore OpenBabel::OBBase::HasData(char const *);
-@@ -313,7 +312,6 @@
- %ignore OpenBabel::OBForceField::DiverseConfGen;
- #endif
- 
--# Ignore shadowed methods
- %ignore OpenBabel::OBForceField::VectorSubtract(const double *const, const double *const, double *);
- %ignore OpenBabel::OBForceField::VectorMultiply(const double *const, const double, double *);
- %warnfilter(516) OpenBabel::OBForceField; // Ignoring std::string methods in favour of char* ones
-@@ -331,21 +329,12 @@
- 
- %warnfilter(503) OpenBabel::OBBitVec; // Not wrapping any of the overloaded operators
- %include <openbabel/bitvec.h>
--# Ignore shadowed method
- %ignore OpenBabel::OBRotor::GetRotAtoms() const;
- %include <openbabel/rotor.h>
- %ignore OpenBabel::Swab;
- %include <openbabel/rotamer.h>
- %include <openbabel/spectrophore.h>
- 
--# The following %ignores avoid warning messages due to shadowed classes.
--# This does not imply a loss of functionality as (in this case)
--# the shadowed class is identical (from the point of view of SWIG) to
--# the shadowing class.
--# This is because C++ references (&) are transformed by SWIG back into
--# pointers, so that OBAtomIter(OBMol &) would be treated the same as
--# OBAtomIter(OBMol *).
--
- %ignore OBAtomAtomIter(OBAtom &);
- %ignore OBAtomBondIter(OBAtom &);
- %ignore OBMolAngleIter(OBMol &);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openbabel.git/commitdiff/06c68e4247092a025ca0a1e34b7fb1fa8abf62cb