commit openbabel for openSUSE:Factory

19 Jun 2016

Hello community,

here is the log from the commit of package openbabel for openSUSE:Factory checked in at 2016-06-19 10:50:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openbabel (Old)
 and      /work/SRC/openSUSE:Factory/.openbabel.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "openbabel"

Changes:
--------

--- /work/SRC/openSUSE:Factory/openbabel/openbabel.changes	2015-06-23 11:58:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.openbabel.new/openbabel.changes	2016-06-19 10:50:25.000000000 +0200
@@ -1,0 +2,19 @@
+Fri Jun 17 09:02:52 UTC 2016 - martin.liska@suse.com
+
+- Fix errors seen by 02-check-gcc-output script.
+
+-------------------------------------------------------------------
+Thu Jun 16 14:39:01 UTC 2016 - tchvatal@suse.com
+
+- Version update to 2.3.2 and cripple the tarball
+  * various small bugfixes, the git is far away from this but
+    upstream seems not to do releases
+  * Add patch to properly install bindings to right location:
+    + python-installdir.patch
+
+-------------------------------------------------------------------
+Thu Jun 16 13:00:32 UTC 2016 - mliska@suse.cz
+
+- Add patch to build with gcc6 openbabel-gcc6.patch
+
+-------------------------------------------------------------------

Old:
----
  openbabel-2.3.1-crippled.tar.bz2

New:
----
  openbabel-2.3.2-crippled.tar.bz2
  openbabel-gcc6.patch
  python-installdir.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ openbabel.spec ++++++
--- /var/tmp/diff_new_pack.oFqA1I/_old	2016-06-19 10:50:27.000000000 +0200
+++ /var/tmp/diff_new_pack.oFqA1I/_new	2016-06-19 10:50:27.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package openbabel
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           openbabel
-Version:        2.3.1
+Version:        2.3.2
 Release:        0
 Summary:        Open Babel - The Open Source Chemistry Toolbox
 License:        GPL-2.0
@@ -30,10 +30,14 @@
 Patch0:         openbabel-2.3.1-no-build-date.patch
 # PATCH-FIX-UPSTREAM openbabel-gcc5.patch dimstar@opensuse.org -- Fix build with GCC5, taken from git
 Patch1:         openbabel-gcc5.patch
+# PATCH-FIX-UPSTREAM openbabel-gcc6.patch mliska@suse.cz -- Fix build with GCC6
+Patch2:         openbabel-gcc6.patch
+# PATCH-MERGED-UPSTREAM python-installdir.patch tchvatal@suse.com -- Fix bindings install dir
+Patch3:         python-installdir.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  libeigen2-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 BuildRequires:  swig
 BuildRequires:  zlib-devel
@@ -84,25 +88,23 @@
 %setup -q
 %patch0
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
-%define libsuffix ""
-%if "%{_lib}" == "lib64"
-%define libsuffix 64
-%endif
-cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_SUFFIX=%libsuffix -DPYTHON_BINDINGS=ON -DCMAKE_SKIP_INSTALL_RPATH=ON
+export CXXFLAGS="%{optflags} -std=gnu++98 -fno-strict-aliasing"
+%cmake \
+    -DPYTHON_BINDINGS=ON \
+    -DRUN_SWIG=ON \
+    -DOPTIMIZE_NATIVE=OFF
 make %{?_smp_mflags}
 
 %install
-make DESTDIR=%{buildroot} install
+%cmake_install
 
 %post -n libopenbabel4 -p /sbin/ldconfig
-
 %postun -n libopenbabel4 -p /sbin/ldconfig
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root,-)
 %{_libdir}/openbabel

++++++ openbabel-2.3.1-crippled.tar.bz2 -> openbabel-2.3.2-crippled.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/openbabel/openbabel-2.3.1-crippled.tar.bz2 /work/SRC/openSUSE:Factory/.openbabel.new/openbabel-2.3.2-crippled.tar.bz2 differ: char 11, line 1

++++++ openbabel-gcc6.patch ++++++
Index: openbabel-2.3.2/src/bitvec.cpp
===================================================================
--- openbabel-2.3.2.orig/src/bitvec.cpp
+++ openbabel-2.3.2/src/bitvec.cpp
@@ -57,11 +57,11 @@ namespace OpenBabel
 
   static unsigned int bitsoff[SETWORD] =
     {
-      0xFFFFFFFF,0xFFFFFFFE,0xFFFFFFFC,0xFFFFFFF8,0xFFFFFFF0,0xFFFFFFE0,0xFFFFFFC0,
-      0xFFFFFF80,0xFFFFFF00,0xFFFFFE00,0xFFFFFC00,0xFFFFF800,0xFFFFF000,0xFFFFE000,
-      0xFFFFC000,0xFFFF8000,0xFFFF0000,0xFFFE0000,0xFFFC0000,0xFFF80000,0xFFF00000,
-      0xFFE00000,0xFFC00000,0xFF800000,0xFF000000,0xFE000000,0xFC000000,0xF8000000,
-      0xF0000000,0xE0000000,0xC0000000,0x80000000
+      (int)0xFFFFFFFF,(int)0xFFFFFFFE,(int)0xFFFFFFFC,(int)0xFFFFFFF8,(int)0xFFFFFFF0,(int)0xFFFFFFE0,(int)0xFFFFFFC0,
+      (int)0xFFFFFF80,(int)0xFFFFFF00,(int)0xFFFFFE00,(int)0xFFFFFC00,(int)0xFFFFF800,(int)0xFFFFF000,(int)0xFFFFE000,
+      (int)0xFFFFC000,(int)0xFFFF8000,(int)0xFFFF0000,(int)0xFFFE0000,(int)0xFFFC0000,(int)0xFFF80000,(int)0xFFF00000,
+      (int)0xFFE00000,(int)0xFFC00000,(int)0xFF800000,(int)0xFF000000,(int)0xFE000000,(int)0xFC000000,(int)0xF8000000,
+      (int)0xF0000000,(int)0xE0000000,(int)0xC0000000,(int)0x80000000
     };
 
 #ifndef LowBit
--- openbabel-2.3.2/src/formats/tinkerformat.cpp	2012-10-03 21:08:14.000000000 +0200
+++ openbabel-2.3.2/src/formats/tinkerformat.cpp	2016-06-17 10:54:22.648746512 +0200
@@ -483,6 +483,9 @@
     default:
       return 0;
     }
+
+    /* To suppress RPM warning.  */
+    return 0;
   }
 
 } //namespace OpenBabel

++++++ python-installdir.patch ++++++
Index: openbabel-2.3.2/scripts/CMakeLists.txt
===================================================================
--- openbabel-2.3.2.orig/scripts/CMakeLists.txt
+++ openbabel-2.3.2/scripts/CMakeLists.txt
@@ -90,10 +90,23 @@ if (DO_PYTHON_BINDINGS)
             OUTPUT_NAME _openbabel
             PREFIX ""
             SUFFIX .so )
+        execute_process(
+          COMMAND
+          ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print(sysconfig.get_python_lib(1,0,prefix='${CMAKE_INSTALL_PREFIX}'))"
+          OUTPUT_VARIABLE PYTHON_INSTDIR
+          OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+
         add_dependencies(bindings_python openbabel)
-        install(TARGETS bindings_python LIBRARY DESTINATION ${LIB_INSTALL_DIR})
-        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py DESTINATION ${LIB_INSTALL_DIR})
-        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py DESTINATION ${LIB_INSTALL_DIR})
+        install(TARGETS bindings_python
+                LIBRARY DESTINATION ${PYTHON_INSTDIR}
+                COMPONENT bindings_python)
+        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/openbabel.py
+                DESTINATION ${PYTHON_INSTDIR}
+                COMPONENT bindings_python)
+        install(FILES ${openbabel_SOURCE_DIR}/scripts/python/pybel.py
+                DESTINATION ${PYTHON_INSTDIR}
+                COMPONENT bindings_python)
     else(NOT WIN32)
         set_target_properties(bindings_python PROPERTIES
             OUTPUT_NAME _openbabel

    

commit openbabel for openSUSE:Factory

root＠hilbert.suse.de