rpms/openbabel/devel openbabel-inchi.patch, 1.1, 1.2 openbabel.spec, 1.48, 1.49 openbabel-check.patch, 1.11, NONE

[Dominik Mierzejewski]

Author: rathann

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

Modified Files:
	openbabel-inchi.patch openbabel.spec 
Removed Files:
	openbabel-check.patch 
Log Message:
- fixed configure to detect external inchi (both pre-1.0.2 and 1.0.2)
- re-enabled inchi tests


openbabel-inchi.patch:
 configure.in            |    5 ++++-
 src/formats/Makefile.am |   14 +++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

Index: openbabel-inchi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel-inchi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openbabel-inchi.patch	13 Sep 2009 17:27:34 -0000	1.1
+++ openbabel-inchi.patch	14 Sep 2009 00:01:18 -0000	1.2
@@ -1,12 +1,65 @@
 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)
++++ openbabel-2.2.3/configure.in	2009-09-14 01:14:49.000000000 +0200
+@@ -239,8 +239,11 @@ 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(stdinchi, GetStdINCHI, LIBSTDINCHI="-lstdinchi", LIBSTDINCHI="")
+ AC_CHECK_LIB(inchi, GetINCHI, LIBINCHI="-linchi", LIBINCHI="")
+-AM_CONDITIONAL(BUILD_INCHI, test x"$LIBINCHI" = "x" -o "$inchi" = "yes")
++AM_CONDITIONAL(HAVE_INCHI, test x"$LIBINCHI" != "x" -o x"$LIBSTDINCHI" != "x" -o "$inchi" = "yes")
++AM_CONDITIONAL(HAVE_STDINCHI, test x"$LIBSTDINCHI" != "x")
++AM_CONDITIONAL(BUILD_INCHI, test "$inchi" = "yes")
  
  AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no])
+ AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cv_zlib_h=no])
+diff -up openbabel-2.2.3/src/formats/Makefile.am.inchi openbabel-2.2.3/src/formats/Makefile.am
+--- openbabel-2.2.3/src/formats/Makefile.am.inchi	2009-07-09 15:05:02.000000000 +0200
++++ openbabel-2.2.3/src/formats/Makefile.am	2009-09-14 01:15:55.000000000 +0200
+@@ -39,11 +39,17 @@ endif
+ 
+ if !BUILD_SHARED
+ noinst_LTLIBRARIES = libformats.la
++if HAVE_INCHI
+ if BUILD_INCHI
+ libformats_la_LIBADD = inchi102/libinchi.la
+ else
++if HAVE_STDINCHI
++libformats_la_LIBADD = -lstdinchi
++else
+ libformats_la_LIBADD = -linchi
+ endif
++endif
++endif
+ libformats_la_SOURCES = \
+ 	APIInterface.cpp MCDLformat.cpp \
+ 	CSRformat.cpp PQSformat.cpp alchemyformat.cpp \
+@@ -124,7 +130,7 @@ if HAVE_SHARED_POINTER
+ formats_LTLIBRARIES += chemdrawcdxformat.la chemkinformat.la \
+                           rxnformat.la rsmiformat.la
+ endif
+-if BUILD_INCHI
++if HAVE_INCHI
+ formats_LTLIBRARIES += inchiformat.la
+ endif
+ if BUILD_ZLIB
+@@ -261,12 +267,18 @@ hinformat_la_SOURCES = hinformat.cpp 
+ hinformat_la_LDFLAGS = -module -avoid-version -no-undefined $(win32ldflags) ../libopenbabel.la 
+ 
+ inchiformat_la_SOURCES = inchiformat.cpp  getinchi.cpp
++if HAVE_INCHI
+ if BUILD_INCHI
+ inchiformat_la_LDFLAGS = -module -avoid-version -no-undefined $(win32ldflags) ../libopenbabel.la inchi102/libinchi.la
+ else
+ inchiformat_la_LDFLAGS = -module -avoid-version -no-undefined $(win32ldflags) ../libopenbabel.la
++if HAVE_STDINCHI
++inchiformat_la_LIBADD = -lstdinchi
++else
+ inchiformat_la_LIBADD = -linchi
+ endif
++endif
++endif
+ 
+ jaguarformat_la_SOURCES = jaguarformat.cpp 
+ jaguarformat_la_LDFLAGS = -module -avoid-version -no-undefined $(win32ldflags) ../libopenbabel.la 


Index: openbabel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- openbabel.spec	13 Sep 2009 17:27:34 -0000	1.48
+++ openbabel.spec	14 Sep 2009 00:01:18 -0000	1.49
@@ -16,7 +16,6 @@ Group: Applications/File
 URL: http://openbabel.org/
 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
@@ -91,7 +90,6 @@ Ruby wrapper for the Open Babel library.
 %prep
 %setup -q -n %{name}-%{version}%{beta_str}
 %patch1 -p1 -b .r
-%patch2 -p1 -b .chk
 %patch3 -p1 -b .inchi
 chmod 644 src/formats/mmcifformat.cpp
 
@@ -186,7 +184,8 @@ popd
 * 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
+- fixed configure to detect external inchi (both pre-1.0.2 and 1.0.2)
+- re-enabled inchi tests
 
 * 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-check.patch DELETED ---