[packages/openbabel] - stop running broken checks for very old gcc - rel 3

baggins baggins at pld-linux.org
Sun Nov 26 14:23:44 CET 2017


commit 02c53f126b5d59df7842efc35693235025ebde19
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Nov 26 14:23:23 2017 +0100

    - stop running broken checks for very old gcc
    - rel 3

 cmake.patch    | 20 ++++++++++++++++++++
 openbabel.spec |  4 +++-
 2 files changed, 23 insertions(+), 1 deletion(-)
---
diff --git a/openbabel.spec b/openbabel.spec
index 01a8352..e1eec89 100644
--- a/openbabel.spec
+++ b/openbabel.spec
@@ -10,7 +10,7 @@ Summary:	A cross-platform chemistry program and library designed to convert file
 Summary(pl.UTF-8):	Międzyplatformowy program chemiczny i biblioteka do konwersji formatów plików
 Name:		openbabel
 Version:	2.4.1
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Libraries
 #Source0Download: https://github.com/openbabel/openbabel/releases
@@ -22,6 +22,7 @@ Patch2:		perl-install.patch
 Patch3:		ruby-install.patch
 Patch4:		gcc6.patch
 Patch5:		plugindir.patch
+Patch6:		cmake.patch
 URL:		http://openbabel.org/
 BuildRequires:	cairo-devel
 BuildRequires:	cmake >= 2.6.0
@@ -136,6 +137,7 @@ Wiązanie języka Ruby do biblioteki OpenBabel.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %cmake . \
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 0000000..4efe8f9
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,20 @@
+--- openbabel-openbabel-2-4-1/CMakeLists.txt~	2017-11-26 13:31:50.000000000 +0100
++++ openbabel-openbabel-2-4-1/CMakeLists.txt	2017-11-26 13:55:19.329246765 +0100
+@@ -20,7 +20,6 @@
+ endif()
+ 
+ include (CheckCXXCompilerFlag)
+-include (MacroEnsureVersion)
+ 
+ # Version numbering - should be bumped for each release
+ # Note that for "beta" releases, we should start at x.90.0 -- we've
+@@ -245,9 +244,6 @@
+   if (NOT _gcc_version)
+     string (REGEX REPLACE ".*\\(GCC\\).* ([34]\\.[0-9]) .*" "\\1.0" _gcc_version "${_gcc_version_info}")
+   endif ()
+-  macro_ensure_version("4.0.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_0)
+-  macro_ensure_version("4.1.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_1)
+-  macro_ensure_version("4.2.0" "${_gcc_version}" GCC_IS_NEWER_THAN_4_2)
+ endif()
+ 
+ if(UNIX)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/openbabel.git/commitdiff/02c53f126b5d59df7842efc35693235025ebde19



More information about the pld-cvs-commit mailing list