update to 2.4.1
This commit is contained in:
parent
8148a007ae
commit
f063748cb1
|
@ -6,3 +6,5 @@ openbabel-2.0.2.tar.gz
|
||||||
/openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d.tar.gz
|
/openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d.tar.gz
|
||||||
/openbabel-a345105b28173eb7da14ecd1e5beebe94140c6d7.tar.gz
|
/openbabel-a345105b28173eb7da14ecd1e5beebe94140c6d7.tar.gz
|
||||||
/openbabel-3a63a9849f8d9719c5989c43875d51be50c53019.tar.gz
|
/openbabel-3a63a9849f8d9719c5989c43875d51be50c53019.tar.gz
|
||||||
|
/openbabel-2-4-0.tar.gz
|
||||||
|
/openbabel-2-4-1.tar.gz
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
diff -up openbabel-3a63a9849f8d9719c5989c43875d51be50c53019/test/CMakeLists.txt.some_arches openbabel-3a63a9849f8d9719c5989c43875d51be50c53019/test/CMakeLists.txt
|
diff -up openbabel-openbabel-2-4-0/test/CMakeLists.txt.tests openbabel-openbabel-2-4-0/test/CMakeLists.txt
|
||||||
--- openbabel-3a63a9849f8d9719c5989c43875d51be50c53019/test/CMakeLists.txt.some_arches 2016-02-16 23:47:25.000000000 +0100
|
--- openbabel-openbabel-2-4-0/test/CMakeLists.txt.tests 2016-09-21 21:55:37.000000000 +0200
|
||||||
+++ openbabel-3a63a9849f8d9719c5989c43875d51be50c53019/test/CMakeLists.txt 2016-02-19 08:30:52.620492855 +0100
|
+++ openbabel-openbabel-2-4-0/test/CMakeLists.txt 2016-10-10 13:48:52.726803964 +0200
|
||||||
@@ -34,7 +34,7 @@ set (implicitH_parts 1)
|
@@ -34,7 +34,7 @@ set (implicitH_parts 1)
|
||||||
set (lssr_parts 1 2 3 4 5)
|
set (lssr_parts 1 2 3 4 5)
|
||||||
set (isomorphism_parts 1 2 3 4 5 6 7 8)
|
set (isomorphism_parts 1 2 3 4 5 6 7 8)
|
||||||
set (multicml_parts 1)
|
set (multicml_parts 1)
|
||||||
-set (regressions_parts 1 221 222)
|
-set (regressions_parts 1 221 222 223 224)
|
||||||
+set (regressions_parts 222)
|
+set (regressions_parts 222 223 224)
|
||||||
set (rotor_parts 1 2 3 4)
|
set (rotor_parts 1 2 3 4)
|
||||||
set (shuffle_parts 1 2 3 4 5)
|
set (shuffle_parts 1 2 3 4 5)
|
||||||
set (smiles_parts 1 2 3)
|
set (smiles_parts 1 2 3)
|
||||||
|
@ -24,7 +24,7 @@ diff -up openbabel-3a63a9849f8d9719c5989c43875d51be50c53019/test/CMakeLists.txt.
|
||||||
if(PYTHON_EXECUTABLE)
|
if(PYTHON_EXECUTABLE)
|
||||||
set(pytests
|
set(pytests
|
||||||
- babel sym smartssym fastsearch unique kekule pdbformat)
|
- babel sym smartssym fastsearch unique kekule pdbformat)
|
||||||
+ babel smartssym fastsearch unique kekule pdbformat)
|
+ babel smartssym fastsearch kekule pdbformat)
|
||||||
foreach(pytest ${pytests})
|
foreach(pytest ${pytests})
|
||||||
SET_SOURCE_FILES_PROPERTIES(test${pytest}.py PROPERTIES
|
SET_SOURCE_FILES_PROPERTIES(test${pytest}.py PROPERTIES
|
||||||
PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
|
PYTHONPATH "${CMAKE_SOURCE_DIR}/scripts/python:${CMAKE_BINARY_DIR}/lib${LIB_SUFFIX}"
|
|
@ -8,13 +8,13 @@
|
||||||
%global __provides_exclude_from ^(%{perl_vendorarch}/auto|%{python2_sitearch}|%{python3_sitearch})/.*\\.so$
|
%global __provides_exclude_from ^(%{perl_vendorarch}/auto|%{python2_sitearch}|%{python3_sitearch})/.*\\.so$
|
||||||
|
|
||||||
Name: openbabel
|
Name: openbabel
|
||||||
Version: 2.3.90
|
Version: 2.4.1
|
||||||
Release: 0.11.20160216git%{shortcommit}%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Chemistry software file format converter
|
Summary: Chemistry software file format converter
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
Group: Applications/File
|
Group: Applications/File
|
||||||
URL: http://openbabel.org/
|
URL: http://openbabel.org/
|
||||||
Source0: https://github.com/openbabel/openbabel/archive/%{commit}/openbabel-%{commit}.tar.gz
|
Source0: https://github.com/openbabel/openbabel/archive/openbabel-%(echo %{version} | tr '.' '-').tar.gz
|
||||||
Source1: obgui.desktop
|
Source1: obgui.desktop
|
||||||
# fix perl modules install path
|
# fix perl modules install path
|
||||||
Patch1: %{name}-perl.patch
|
Patch1: %{name}-perl.patch
|
||||||
|
@ -29,7 +29,7 @@ Patch7: openbabel-ruby19-vendorarch.patch
|
||||||
# - ARM (#1094491)
|
# - ARM (#1094491)
|
||||||
# - aarch64 (#1094513)
|
# - aarch64 (#1094513)
|
||||||
# Upstream bugs: https://sourceforge.net/p/openbabel/bugs/927/ https://sourceforge.net/p/openbabel/bugs/945/
|
# Upstream bugs: https://sourceforge.net/p/openbabel/bugs/927/ https://sourceforge.net/p/openbabel/bugs/945/
|
||||||
Patch8: openbabel-disable-tests-some-arches.patch
|
Patch8: openbabel-disable-tests.patch
|
||||||
Patch9: openbabel-narrowing-conversion.patch
|
Patch9: openbabel-narrowing-conversion.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
|
@ -141,14 +141,12 @@ BuildRequires: ruby-devel
|
||||||
Ruby wrapper for the Open Babel library.
|
Ruby wrapper for the Open Babel library.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{commit}
|
%setup -q -n %{name}-%{name}-%(echo %{version} | tr '.' '-')
|
||||||
%patch1 -p1 -b .perl_path
|
%patch1 -p1 -b .perl_path
|
||||||
%patch4 -p1 -b .plugindir
|
%patch4 -p1 -b .plugindir
|
||||||
%patch6 -p1 -b .noswig_ruby
|
%patch6 -p1 -b .noswig_ruby
|
||||||
%patch7 -p1 -b .ruby_vendor
|
%patch7 -p1 -b .ruby_vendor
|
||||||
%ifarch %{power64} s390 s390x armv7hl aarch64
|
%patch8 -p1 -b .tests
|
||||||
%patch8 -p1 -b .some_arches
|
|
||||||
%endif
|
|
||||||
%patch9 -p1 -b .nc
|
%patch9 -p1 -b .nc
|
||||||
convert src/GUI/babel.xpm -transparent white babel.png
|
convert src/GUI/babel.xpm -transparent white babel.png
|
||||||
|
|
||||||
|
@ -274,6 +272,9 @@ make test
|
||||||
%{ruby_vendorarchdir}/openbabel.so
|
%{ruby_vendorarchdir}/openbabel.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Oct 11 2016 Dominik Mierzejewski <rpm@greysector.net> - 2.4.1-1
|
||||||
|
- update to 2.4.1
|
||||||
|
|
||||||
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.90-0.11.20160216git3a63a98
|
* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.3.90-0.11.20160216git3a63a98
|
||||||
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue