From 08779a3c764fb56906c30726ff5e221325710f1f Mon Sep 17 00:00:00 2001 From: Dominik Mierzejewski Date: Apr 16 2015 16:42:02 +0000 Subject: updated to current Git master HEAD - dropped obsolete patches --- diff --git a/.gitignore b/.gitignore index 9e41af4..642c26d 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ openbabel-2.0.2.tar.gz /openbabel-2.3.1.tar.gz /openbabel-2.3.2.tar.gz /openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d.tar.gz +/openbabel-a345105b28173eb7da14ecd1e5beebe94140c6d7.tar.gz diff --git a/openbabel-gcc5.patch b/openbabel-gcc5.patch deleted file mode 100644 index a3941c2..0000000 --- a/openbabel-gcc5.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/include/openbabel/shared_ptr.h.gcc5 openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/include/openbabel/shared_ptr.h ---- openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/include/openbabel/shared_ptr.h.gcc5 2015-02-04 20:04:57.000000000 +0100 -+++ openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/include/openbabel/shared_ptr.h 2015-02-07 22:10:37.433163644 +0100 -@@ -21,7 +21,7 @@ GNU General Public License for more deta - #define obsharedptr boost::shared_ptr - #else - #include -- #if __GNUC__ == 4 //&& __GNUC_MINOR__ < 3 removed at the suggestion of Konstantin Tokarev -+ #if __GNUC__ >= 4 //&& __GNUC_MINOR__ < 3 removed at the suggestion of Konstantin Tokarev - #ifdef _LIBCPP_VERSION - #include - #else diff --git a/openbabel-ruby22-remove-deprecated-usage.patch b/openbabel-ruby22-remove-deprecated-usage.patch deleted file mode 100644 index 492bdc5..0000000 --- a/openbabel-ruby22-remove-deprecated-usage.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/ruby/extconf.rb.rbconfig openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/ruby/extconf.rb ---- openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/ruby/extconf.rb.rbconfig 2015-02-07 21:51:50.828130289 +0100 -+++ openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/ruby/extconf.rb 2015-02-07 21:57:02.185770250 +0100 -@@ -3,7 +3,7 @@ - # Compensate for the fact that Ruby will try to build universal - # binaries on OS X by default - require 'rbconfig' --if Config::CONFIG["arch"] =~ /universal-darwin/ -+if RbConfig::CONFIG["arch"] =~ /universal-darwin/ - ENV['ARCHFLAGS'] = case `uname -smr`.chomp - when "i386" then '-arch i386' - when "ppc" then '-arch ppc' diff --git a/openbabel-swig3.patch b/openbabel-swig3.patch deleted file mode 100644 index 65ec448..0000000 --- a/openbabel-swig3.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff -up openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-perl.i.swig3 openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-perl.i ---- openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-perl.i.swig3 2015-02-04 20:04:57.000000000 +0100 -+++ openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-perl.i 2015-02-10 22:17:43.043291031 +0100 -@@ -179,7 +179,7 @@ CAST_GENERICDATA_TO(VirtualBond) - - %import - --# CloneData should be used instead of the following method -+%# CloneData should be used instead of the following method - %ignore OpenBabel::OBBase::SetData; - %rename(_local) OpenBabel::local; - %include -@@ -224,7 +224,7 @@ namespace std { class stringbuf {}; } - %ignore OpenBabel::OBForceField::DiverseConfGen; - #endif - --# Ignore shadowed methods -+%# Ignore shadowed methods - %ignore OpenBabel::OBForceField::VectorSubtract(const double *const, const double *const, double *); - %ignore OpenBabel::OBForceField::VectorMultiply(const double *const, const double, double *); - %include -@@ -234,20 +234,20 @@ namespace std { class stringbuf {}; } - - %warnfilter(503) OpenBabel::OBBitVec; // Not wrapping any of the overloaded operators - %include --# Ignore shadowed method -+%# Ignore shadowed method - %ignore OpenBabel::OBRotor::GetRotAtoms() const; - %warnfilter(314); // 'next' is a Perl keyword - %include - %ignore OpenBabel::Swab; - %include - --# 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 *). -+%# 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 &); -diff -up openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-python.i.swig3 openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-python.i ---- openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-python.i.swig3 2015-02-04 20:04:57.000000000 +0100 -+++ openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-python.i 2015-02-10 22:17:43.043291031 +0100 -@@ -229,7 +229,7 @@ CAST_GENERICDATA_TO(SquarePlanarStereo) - %include - %include - --# CloneData should be used instead of the following method -+%# CloneData should be used instead of the following method - %ignore OpenBabel::OBBase::SetData; - %include - -@@ -291,7 +291,7 @@ OBMol.BeginResidues = OBMol.EndResidues - %ignore OpenBabel::OBDescriptor::LessThan; - %include - --# Ignore shadowed methods -+%# Ignore shadowed methods - %ignore OpenBabel::OBForceField::VectorSubtract(const double *const, const double *const, double *); - %ignore OpenBabel::OBForceField::VectorMultiply(const double *const, const double, double *); - %include -@@ -312,7 +312,7 @@ OBMol.BeginResidues = OBMol.EndResidues - - %warnfilter(503) OpenBabel::OBBitVec; // Not wrapping any of the overloaded operators - %include --# Ignore shadowed method -+%# Ignore shadowed method - %ignore OpenBabel::OBRotor::GetRotAtoms() const; - %include - %ignore OpenBabel::Swab; -@@ -323,13 +323,13 @@ OBMol.BeginResidues = OBMol.EndResidues - %include - #endif - --# 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 *). -+%# 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 &); -@@ -348,9 +348,9 @@ OBMol.BeginResidues = OBMol.EndResidues - %ignore OBResidueIter(OBMol &); - %ignore OBResidueAtomIter(OBResidue &); - --# These classes are renamed so that they can be replaced by Python --# classes of the same name which provide Pythonic iterators --# (see %pythoncode section below) -+%# These classes are renamed so that they can be replaced by Python -+%# classes of the same name which provide Pythonic iterators -+%# (see %pythoncode section below) - - %rename(_OBAtomAtomIter) OpenBabel::OBAtomAtomIter; - %rename(_OBAtomBondIter) OpenBabel::OBAtomBondIter; -@@ -369,8 +369,8 @@ OBMol.BeginResidues = OBMol.EndResidues - - %include - --# The following class, OBiter, is subclassed to provide Python iterators --# equivalent to the C++ iterators in obiter.h and the plugin iterators -+%# The following class, OBiter, is subclassed to provide Python iterators -+%# equivalent to the C++ iterators in obiter.h and the plugin iterators - - %pythoncode %{ - class OBIter(object): -@@ -460,7 +460,7 @@ def double_array(mylist): - return c - %} - --# Copy some of the global variables in cvar into the openbabel namespace -+%# Copy some of the global variables in cvar into the openbabel namespace - - %pythoncode %{ - obErrorLog = cvar.obErrorLog -@@ -471,7 +471,7 @@ atomtyper = cvar.atomtyper - aromtyper = cvar.aromtyper - %} - --# Functions to set the log file to std::cout and std::cerr -+%# Functions to set the log file to std::cout and std::cerr - - %ignore OBForceField::SetLogFile(std::ostream *pos); - %extend OpenBabel::OBForceField { -diff -up openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-ruby.i.swig3 openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-ruby.i ---- openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-ruby.i.swig3 2015-02-04 20:04:57.000000000 +0100 -+++ openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d/scripts/openbabel-ruby.i 2015-02-10 22:19:12.334540544 +0100 -@@ -181,7 +181,7 @@ CAST_GENERICDATA_TO(VirtualBond) - - %import - --# CloneData should be used instead of the following method -+%# CloneData should be used instead of the following method - %ignore OpenBabel::OBBase::SetData; - %include - %include -@@ -217,7 +217,7 @@ namespace std { class stringbuf {}; } - %include - %include - --# Ignore shadowed methods -+%# Ignore shadowed methods - %ignore OpenBabel::OBForceField::VectorSubtract(const double *const, const double *const, double *); - %ignore OpenBabel::OBForceField::VectorMultiply(const double *const, const double, double *); - #ifdef HAVE_EIGEN -@@ -241,13 +241,13 @@ namespace std { class stringbuf {}; } - %ignore OpenBabel::Swab; - %include - --# 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 *). -+%# 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 &); diff --git a/openbabel.spec b/openbabel.spec index cb9eeda..9b1a2e3 100644 --- a/openbabel.spec +++ b/openbabel.spec @@ -1,4 +1,4 @@ -%global commit 75414ad4e043f16ba72ae51c7ca60f448576688d +%global commit a345105b28173eb7da14ecd1e5beebe94140c6d7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %define perl_vendorarch %(eval "`perl -V:installvendorarch`"; echo $installvendorarch) @@ -9,7 +9,7 @@ Name: openbabel Version: 2.3.90 -Release: 0.3.20150204git%{shortcommit}%{?dist} +Release: 0.4.20150204git%{shortcommit}%{?dist} Summary: Chemistry software file format converter License: GPLv2 Group: Applications/File @@ -30,12 +30,6 @@ Patch7: openbabel-ruby19-vendorarch.patch # - aarch64 (#1094513) # Upstream bugs: https://sourceforge.net/p/openbabel/bugs/927/ https://sourceforge.net/p/openbabel/bugs/945/ Patch8: openbabel-disable-tests-some-arches.patch -# Remove deprecated usage on ruby 22 -Patch10: openbabel-ruby22-remove-deprecated-usage.patch -# Fix build with gcc5 -Patch11: openbabel-gcc5.patch -# Fix build with swig-3.x -Patch12: openbabel-swig3.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: cmake BuildRequires: desktop-file-utils @@ -143,9 +137,6 @@ Ruby wrapper for the Open Babel library. %ifarch %{power64} s390 s390x armv7hl aarch64 %patch8 -p1 -b .some_arches %endif -%patch10 -p1 -b .rbconfig -%patch11 -p1 -b .gcc5 -%patch12 -p1 -b .swig3 convert src/GUI/babel.xpm -transparent white babel.png # Remove duplicate html files @@ -238,6 +229,10 @@ make test %{ruby_vendorarchdir}/openbabel.so %changelog +* Thu Apr 16 2015 Dominik Mierzejewski - 2.3.90-0.4.20150204gita345105 +- updated to current Git master HEAD +- dropped obsolete patches + * Wed Mar 25 2015 Rex Dieter 2.3.90-0.3.20150204git - rebuild (gcc5) diff --git a/sources b/sources index 27ada34..6e3f47c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d73cc446061060d36c5306d44430a79f openbabel-75414ad4e043f16ba72ae51c7ca60f448576688d.tar.gz +2d139c1f2adbd101ccfcb4ade7c7c6d2 openbabel-a345105b28173eb7da14ecd1e5beebe94140c6d7.tar.gz