Merge branch 'f29'
This commit is contained in:
commit
2fe67b2200
|
@ -0,0 +1,12 @@
|
||||||
|
diff -up openbabel-openbabel-2-4-1/test/CMakeLists.txt.s390x openbabel-openbabel-2-4-1/test/CMakeLists.txt
|
||||||
|
--- openbabel-openbabel-2-4-1/test/CMakeLists.txt.s390x 2016-10-10 17:56:17.000000000 +0200
|
||||||
|
+++ openbabel-openbabel-2-4-1/test/CMakeLists.txt 2019-01-27 18:29:46.782926714 +0100
|
||||||
|
@@ -62,7 +62,7 @@ set(origtests
|
||||||
|
)
|
||||||
|
set (atom_parts 1 2 3 4)
|
||||||
|
set (ffmmff94_parts 1 2)
|
||||||
|
-set (math_parts 1 2 3 4)
|
||||||
|
+set (math_parts 1 2 3)
|
||||||
|
|
||||||
|
if(BUILD_SHARED)
|
||||||
|
if(LIBXML2_FOUND)
|
|
@ -34,6 +34,8 @@ Patch9: openbabel-narrowing-conversion.patch
|
||||||
# Fix path to libdir in .pc file
|
# Fix path to libdir in .pc file
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1669664
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1669664
|
||||||
Patch10: openbabel-fix-libdir-in-pkgconfig.patch
|
Patch10: openbabel-fix-libdir-in-pkgconfig.patch
|
||||||
|
# Math 4 test is failing on s390x only
|
||||||
|
Patch11: openbabel-disable-tests-s390x.patch
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
BuildRequires: eigen3-devel
|
BuildRequires: eigen3-devel
|
||||||
|
@ -152,6 +154,9 @@ Ruby wrapper for the Open Babel library.
|
||||||
%ifarch aarch64 %{arm} %{power64} s390 s390x
|
%ifarch aarch64 %{arm} %{power64} s390 s390x
|
||||||
%patch8 -p1 -b .tests
|
%patch8 -p1 -b .tests
|
||||||
%endif
|
%endif
|
||||||
|
%ifarch s390x
|
||||||
|
%patch11 -p1 -b .s390x
|
||||||
|
%endif
|
||||||
%patch9 -p1 -b .nc
|
%patch9 -p1 -b .nc
|
||||||
%patch10 -p1
|
%patch10 -p1
|
||||||
convert src/GUI/babel.xpm -transparent white babel.png
|
convert src/GUI/babel.xpm -transparent white babel.png
|
||||||
|
@ -283,6 +288,8 @@ make test
|
||||||
* Sun Jan 27 2019 Dominik Mierzejewski <rpm@greysector.net> - 2.4.1-18
|
* Sun Jan 27 2019 Dominik Mierzejewski <rpm@greysector.net> - 2.4.1-18
|
||||||
- Fix path to libdir in .pc (#1669664)
|
- Fix path to libdir in .pc (#1669664)
|
||||||
- Use https for URL:
|
- Use https for URL:
|
||||||
|
- Exclude obgui from the main openbabel package
|
||||||
|
- Disable failing test on s390x/F29+
|
||||||
|
|
||||||
* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.4.1-17
|
* Mon Jan 21 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.4.1-17
|
||||||
- F-30: rebuild against ruby26
|
- F-30: rebuild against ruby26
|
||||||
|
|
Loading…
Reference in New Issue