rpms/openbabel/devel openbabel-inchi.patch, NONE, 1.1 openbabel-check.patch, 1.10, 1.11 openbabel.spec, 1.47, 1.48 openbabel-gcc43.patch, 1.17, NONE

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/openbabel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11591

Modified Files:
	openbabel-check.patch openbabel.spec 
Added Files:
	openbabel-inchi.patch 
Removed Files:
	openbabel-gcc43.patch 
Log Message:
* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.3-1
- updated to 2.2.3
- dropped obsolete patch
- fix configure to detect external inchi-1.0.2


openbabel-inchi.patch:
 configure.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openbabel-inchi.patch ---
diff -up openbabel-2.2.3/configure.in.inchi openbabel-2.2.3/configure.in
--- openbabel-2.2.3/configure.in.inchi	2009-07-29 03:05:04.000000000 +0200
+++ openbabel-2.2.3/configure.in	2009-08-26 16:26:08.000000000 +0200
@@ -239,7 +239,7 @@ AC_SUBST(LIBDL)
 AM_PATH_XML2(2.6.5)
 AM_CONDITIONAL(BUILD_XML, test x"$XML_LIBS" != "x")
 
-AC_CHECK_LIB(inchi, GetINCHI, LIBINCHI="-linchi", LIBINCHI="")
+AC_CHECK_LIB(stdinchi, GetStdINCHI, LIBINCHI="-lstdinchi", LIBINCHI="")
 AM_CONDITIONAL(BUILD_INCHI, test x"$LIBINCHI" = "x" -o "$inchi" = "yes")
 
 AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no])

openbabel-check.patch:
 wrapper.sh |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Index: openbabel-check.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-check.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openbabel-check.patch	1 Mar 2009 17:46:41 -0000	1.10
+++ openbabel-check.patch	13 Sep 2009 17:27:34 -0000	1.11
@@ -1,10 +1,10 @@
-diff -up openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh
---- openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh.chk	2009-01-12 20:10:33.000000000 +0100
-+++ openbabel-2.2.1b3-20090215-r2890/test/wrapper.sh	2009-03-01 16:19:28.000000000 +0100
+diff -up openbabel-2.2.3/test/wrapper.sh.chk openbabel-2.2.3/test/wrapper.sh
+--- openbabel-2.2.3/test/wrapper.sh.chk	2009-07-29 01:05:03.000000000 +0200
++++ openbabel-2.2.3/test/wrapper.sh	2009-08-26 15:55:28.000000000 +0200
 @@ -16,11 +16,11 @@ TESTS="${TESTS} logp_psa math"
  TESTS="${TESTS} mol phmodel residue rings"
- TESTS="${TESTS} smarts smilesmatch unitcell"
- TESTS="${TESTS} cml.sh test-set.sh"
+ TESTS="${TESTS} smarts smilesmatch strip unitcell"
+ TESTS="${TESTS} zipstream cml.sh test-set.sh"
 -if [ "x${srcdir}" != "x" ]; then
 -  TESTS="${TESTS} ${srcdir}/inchi.pl ${srcdir}/inchi2.pl"
 -else
@@ -18,21 +18,3 @@ diff -up openbabel-2.2.1b3-20090215-r289
  PROVE=prove
  
  echo "top srcdir: .${topsrcdir}."
-@@ -45,4 +45,4 @@ if [ -d ../src/formats/.libs ]; then
-     fi
- fi
- 
--${PROVE} "$@" ${TESTS}
-+${PROVE} --verbose "$@" ${TESTS}
-diff -up openbabel-2.2.0/test/bond.cpp.chk openbabel-2.2.0/test/bond.cpp
---- openbabel-2.2.0/test/bond.cpp.chk	2008-06-13 22:48:05.000000000 +0200
-+++ openbabel-2.2.0/test/bond.cpp	2008-07-06 21:45:44.000000000 +0200
-@@ -58,7 +58,7 @@ int main(int argc,char *argv[])
- 
-   bond1.SetBegin(&begin1);
-   bond1.SetEnd(&end1);
--  cout << "ok 4\n";
-+  cout << "ok 3\n";
- 
-   return(0);
- }


Index: openbabel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- openbabel.spec	25 Jul 2009 20:44:32 -0000	1.47
+++ openbabel.spec	13 Sep 2009 17:27:34 -0000	1.48
@@ -4,20 +4,20 @@
 %{!?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 b3
-%define beta_str b3-20090215-r2890
+%define beta_ver %{nil}
+%define beta_str %{nil}
 
 Name: openbabel
-Version: 2.2.1
-Release: 0.2.%{beta_ver}%{?dist}
+Version: 2.2.3
+Release: 1%{beta_ver}%{?dist}
 Summary: Chemistry software file format converter
 License: GPLv2
 Group: Applications/File
 URL: http://openbabel.org/
-Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz
-Patch: %{name}-gcc43.patch
+Source: http://downloads.sourceforge.net/sourceforge/openbabel/%{name}-%{version}%{beta_str}.tar.gz
 Patch1: %{name}-rpm.patch
 Patch2: %{name}-check.patch
+Patch3: %{name}-inchi.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: inchi-devel
 BuildRequires: libtool
@@ -90,10 +90,10 @@ Ruby wrapper for the Open Babel library.
 
 %prep
 %setup -q -n %{name}-%{version}%{beta_str}
-%patch -p1 -b .gcc43
 %patch1 -p1 -b .r
 %patch2 -p1 -b .chk
-chmod 644 src/formats/{mmcif,fchk}format.cpp
+%patch3 -p1 -b .inchi
+chmod 644 src/formats/mmcifformat.cpp
 
 %build
 autoreconf --force --install
@@ -183,6 +183,11 @@ popd
 %{ruby_sitearch}/openbabel.so
 
 %changelog
+* Wed Aug 26 2009 Dominik Mierzejewski <rpm at greysector.net> 2.2.3-1
+- updated to 2.2.3
+- dropped obsolete patch
+- fix configure to detect external inchi-1.0.2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.1-0.2.b3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- openbabel-gcc43.patch DELETED ---