rpms/openbabel/devel .cvsignore, 1.10, 1.11 openbabel-gcc43.patch, 1.15, 1.16 openbabel.spec, 1.37, 1.38 sources, 1.10, 1.11

Dominik Mierzejewski (rathann) fedora-extras-commits at redhat.com
Wed Jul 2 18:50:55 UTC 2008 

Author: rathann

Update of /cvs/pkgs/rpms/openbabel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27465

Modified Files:
	.cvsignore openbabel-gcc43.patch openbabel.spec sources 
Log Message:
* Wed Jul 02 2008 Dominik Mierzejewski <rpm at greysector.net> 2.2.0-0.6.b7
- updated to 2.2.0 beta7
- new URL
- dropped Python binding split patch (broken, reverted upstream)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	29 May 2008 20:23:54 -0000	1.10
+++ .cvsignore	2 Jul 2008 18:49:45 -0000	1.11
@@ -1 +1 @@
-openbabel-2.2.0b5-20080517-r2469.tar.gz
+openbabel-2.2.0b7-20080627-r2628.tar.gz

openbabel-gcc43.patch:

Index: openbabel-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-gcc43.patch,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openbabel-gcc43.patch	23 Feb 2008 20:49:58 -0000	1.15
+++ openbabel-gcc43.patch	2 Jul 2008 18:49:45 -0000	1.16
@@ -1,6 +1,6 @@
-diff -up openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h.gcc43 openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h
---- openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h.gcc43	2007-11-30 00:01:23.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/src/zipstreamimpl.h	2008-02-23 20:55:49.000000000 +0100
+diff -up openbabel-2.2.0b7/src/zipstreamimpl.h.gcc43 openbabel-2.2.0b7/src/zipstreamimpl.h
+--- openbabel-2.2.0b7/src/zipstreamimpl.h.gcc43	2008-06-21 15:58:02.000000000 +0200
++++ openbabel-2.2.0b7/src/zipstreamimpl.h	2008-07-02 20:16:21.000000000 +0200
 @@ -31,6 +31,8 @@ Altered by: Geoffrey Hutchison 2005 for 
              minor namespace modifications, VC++ compatibility
  */
@@ -10,9 +10,9 @@
  //*****************************************************************************
  //  template class basic_zip_streambuf
  //*****************************************************************************
-diff -up openbabel-2.2.0b3-20080215-r2249/src/residue.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/residue.cpp
---- openbabel-2.2.0b3-20080215-r2249/src/residue.cpp.gcc43	2007-12-12 20:16:13.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/src/residue.cpp	2008-02-23 20:55:49.000000000 +0100
+diff -up openbabel-2.2.0b7/src/residue.cpp.gcc43 openbabel-2.2.0b7/src/residue.cpp
+--- openbabel-2.2.0b7/src/residue.cpp.gcc43	2008-06-21 15:58:02.000000000 +0200
++++ openbabel-2.2.0b7/src/residue.cpp	2008-07-02 20:16:21.000000000 +0200
 @@ -26,6 +26,8 @@ obtained in part or whole from RasMol2 b
  // File Includes
  ///////////////////////////////////////////////////////////////////////////////
@@ -22,21 +22,20 @@
  #include <openbabel/babelconfig.h>
  
  #include <openbabel/residue.h>
-diff -up openbabel-2.2.0b3-20080215-r2249/src/tokenst.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/tokenst.cpp
-diff -up openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp
---- openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp.gcc43	2008-01-21 22:48:26.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/src/obconversion.cpp	2008-02-23 20:55:49.000000000 +0100
-@@ -36,6 +36,7 @@ GNU General Public License for more deta
- #include <sstream>
+diff -up openbabel-2.2.0b7/src/obconversion.cpp.gcc43 openbabel-2.2.0b7/src/obconversion.cpp
+--- openbabel-2.2.0b7/src/obconversion.cpp.gcc43	2008-06-21 15:58:02.000000000 +0200
++++ openbabel-2.2.0b7/src/obconversion.cpp	2008-07-02 20:17:00.000000000 +0200
+@@ -37,6 +37,7 @@ GNU General Public License for more deta
  #include <string>
  #include <map>
+ #include <locale>
 +#include <typeinfo>
  
- #include <openbabel/obconversion.h>
+ #include <stdlib.h>
  
-diff -up openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp
---- openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp.gcc43	2007-12-18 20:12:51.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/src/formats/rxnformat.cpp	2008-02-23 20:58:22.000000000 +0100
+diff -up openbabel-2.2.0b7/src/formats/rxnformat.cpp.gcc43 openbabel-2.2.0b7/src/formats/rxnformat.cpp
+--- openbabel-2.2.0b7/src/formats/rxnformat.cpp.gcc43	2008-06-21 15:58:01.000000000 +0200
++++ openbabel-2.2.0b7/src/formats/rxnformat.cpp	2008-07-02 20:16:21.000000000 +0200
 @@ -16,6 +16,7 @@ GNU General Public License for more deta
  #include "openbabel/babelconfig.h"
  #include <string>
@@ -45,9 +44,9 @@
  #include "openbabel/mol.h"
  #include "openbabel/obconversion.h"
  #include "openbabel/reaction.h"
-diff -up openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp
---- openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp.gcc43	2007-11-30 00:01:23.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/src/formats/fchkformat.cpp	2008-02-23 20:55:49.000000000 +0100
+diff -up openbabel-2.2.0b7/src/formats/fchkformat.cpp.gcc43 openbabel-2.2.0b7/src/formats/fchkformat.cpp
+--- openbabel-2.2.0b7/src/formats/fchkformat.cpp.gcc43	2008-06-13 22:48:02.000000000 +0200
++++ openbabel-2.2.0b7/src/formats/fchkformat.cpp	2008-07-02 20:16:21.000000000 +0200
 @@ -12,6 +12,7 @@ GNU General Public License for more deta
  ***********************************************************************/
  
@@ -56,9 +55,9 @@
  
  // No diagnoalization yet. Perhaps for 2.2 -GRH
  // #include <eigen/matrix.h>
-diff -up openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp
---- openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp.gcc43	2007-11-30 00:01:23.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/src/fingerprint.cpp	2008-02-23 20:55:49.000000000 +0100
+diff -up openbabel-2.2.0b7/src/fingerprint.cpp.gcc43 openbabel-2.2.0b7/src/fingerprint.cpp
+--- openbabel-2.2.0b7/src/fingerprint.cpp.gcc43	2008-06-26 20:55:14.000000000 +0200
++++ openbabel-2.2.0b7/src/fingerprint.cpp	2008-07-02 20:16:21.000000000 +0200
 @@ -21,7 +21,7 @@ GNU General Public License for more deta
  #include <vector>
  #include <algorithm>
@@ -68,9 +67,9 @@
  #include <fstream>
  
  #include <openbabel/fingerprint.h>
-diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h
---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h.gcc43	2007-12-12 20:16:13.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/xml.h	2008-02-23 20:55:49.000000000 +0100
+diff -up openbabel-2.2.0b7/include/openbabel/xml.h.gcc43 openbabel-2.2.0b7/include/openbabel/xml.h
+--- openbabel-2.2.0b7/include/openbabel/xml.h.gcc43	2008-06-21 15:58:05.000000000 +0200
++++ openbabel-2.2.0b7/include/openbabel/xml.h	2008-07-02 20:16:21.000000000 +0200
 @@ -13,6 +13,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICU
  GNU General Public License for more details.
  ***********************************************************************/
@@ -80,9 +79,9 @@
  #include <openbabel/mol.h>
  #include <openbabel/obconversion.h>
  #include <openbabel/obmolecformat.h>
-diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h
---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h.gcc43	2008-01-16 19:42:43.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/obconversion.h	2008-02-23 20:55:49.000000000 +0100
+diff -up openbabel-2.2.0b7/include/openbabel/obconversion.h.gcc43 openbabel-2.2.0b7/include/openbabel/obconversion.h
+--- openbabel-2.2.0b7/include/openbabel/obconversion.h.gcc43	2008-06-21 15:58:05.000000000 +0200
++++ openbabel-2.2.0b7/include/openbabel/obconversion.h	2008-07-02 20:16:21.000000000 +0200
 @@ -28,6 +28,7 @@ GNU General Public License for more deta
  #include <string>
  #include <vector>
@@ -91,9 +90,9 @@
  
  #include <openbabel/dlhandler.h>
  #include <openbabel/oberror.h>
-diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h
---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h.gcc43	2008-01-21 22:03:43.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/data.h	2008-02-23 20:55:49.000000000 +0100
+diff -up openbabel-2.2.0b7/include/openbabel/data.h.gcc43 openbabel-2.2.0b7/include/openbabel/data.h
+--- openbabel-2.2.0b7/include/openbabel/data.h.gcc43	2008-06-21 15:58:05.000000000 +0200
++++ openbabel-2.2.0b7/include/openbabel/data.h	2008-07-02 20:16:21.000000000 +0200
 @@ -23,7 +23,7 @@ GNU General Public License for more deta
  #include <openbabel/babelconfig.h>
  
@@ -103,9 +102,9 @@
  #include <fstream>
  #include <vector>
  #include <string>
-diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h
---- openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h.gcc43	2007-12-12 20:16:13.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/include/openbabel/obmolecformat.h	2008-02-23 20:55:49.000000000 +0100
+diff -up openbabel-2.2.0b7/include/openbabel/obmolecformat.h.gcc43 openbabel-2.2.0b7/include/openbabel/obmolecformat.h
+--- openbabel-2.2.0b7/include/openbabel/obmolecformat.h.gcc43	2008-06-21 15:58:05.000000000 +0200
++++ openbabel-2.2.0b7/include/openbabel/obmolecformat.h	2008-07-02 20:16:21.000000000 +0200
 @@ -23,6 +23,8 @@ GNU General Public License for more deta
    #include <hash_map>
  #endif
@@ -113,12 +112,11 @@
 +#include <typeinfo>
 +
  #include <openbabel/mol.h>
+ #include <openbabel/babelconfig.h>
  #include <openbabel/obconversion.h>
- #include <typeinfo>
-diff -up openbabel-2.2.0b3-20080215-r2249/include/openbabel/lineend.h.gcc43 openbabel-2.2.0b3-20080215-r2249/include/openbabel/lineend.h
-diff -up openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp.gcc43 openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp
---- openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp.gcc43	2007-12-12 20:16:13.000000000 +0100
-+++ openbabel-2.2.0b3-20080215-r2249/tools/babel.cpp	2008-02-23 20:55:55.000000000 +0100
+diff -up openbabel-2.2.0b7/tools/babel.cpp.gcc43 openbabel-2.2.0b7/tools/babel.cpp
+--- openbabel-2.2.0b7/tools/babel.cpp.gcc43	2008-06-21 15:58:03.000000000 +0200
++++ openbabel-2.2.0b7/tools/babel.cpp	2008-07-02 20:16:21.000000000 +0200
 @@ -42,6 +42,7 @@ extern "C" int strncasecmp(const char *s
  #include <openbabel/obconversion.h>
  #include <openbabel/plugin.h>


Index: openbabel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- openbabel.spec	6 Jun 2008 19:06:10 -0000	1.37
+++ openbabel.spec	2 Jul 2008 18:49:45 -0000	1.38
@@ -4,8 +4,8 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
 
-%define beta_ver b5
-%define beta_str b5-20080517-r2469
+%define beta_ver b7
+%define beta_str b7-20080627-r2628
 
 Name: openbabel
 Version: 2.2.0
@@ -13,14 +13,10 @@
 Summary: Chemistry software file format converter
 License: GPLv2
 Group: Applications/File
-URL: http://openbabel.sourceforge.net/
+URL: http://openbabel.org/
 Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz
 Patch: %{name}-gcc43.patch
 Patch1: %{name}-rpm.patch
-# backport upstream patch to split the huge Python binding:
-# http://openbabel.svn.sourceforge.net/viewvc/openbabel?view=rev&revision=2535
-# fixes ppc64 build (#427700)
-Patch2: openbabel-python-ppc64.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: inchi-devel
 BuildRequires: libtool
@@ -94,7 +90,6 @@
 %setup -q -n %{name}-%{version}%{beta_ver}
 %patch -p1 -b .gcc43
 %patch1 -p1 -b .r
-%patch2 -p0 -b .python-ppc64
 
 %build
 # don't reference m4 include directory which isn't shipped in the tarball
@@ -191,6 +186,11 @@
 %{ruby_sitearch}/openbabel.so
 
 %changelog
+* Wed Jul 02 2008 Dominik Mierzejewski <rpm at greysector.net> 2.2.0-0.6.b7
+- updated to 2.2.0 beta7
+- new URL
+- dropped Python binding split patch (broken, reverted upstream)
+
 * Fri Jun 06 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 2.2.0-0.5.b5
 - backport upstream patch to split Python binding (should fix #427700 for good)
 - drop no longer needed ppc64 SWIG/GCC flag hackery


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	29 May 2008 20:23:54 -0000	1.10
+++ sources	2 Jul 2008 18:49:45 -0000	1.11
@@ -1 +1 @@
-7a0556750d9d2b378db021922ea832f3  openbabel-2.2.0b5-20080517-r2469.tar.gz
+541d2e8654d95afe5aee2ad9055e33b2  openbabel-2.2.0b7-20080627-r2628.tar.gz

More information about the scm-commits mailing list