- updated to beta6

- dropped upstream'd patch
- fixed my name in ChangeLog
- copied inchi header for inchi-devel (TODO: make inchi a separate package)
- added %%check

.cvsignore

@@ -1 +1 @@
-openbabel-2.1.0b4.tar.gz
+openbabel-2.1.0b6-20070301-r1814.tar.gz

openbabel-changelog.patch

@@ -0,0 +1,5 @@
+--- openbabel-2.1.0b6/ChangeLog.cl	2007-03-01 01:05:01.000000000 +0100
++++ openbabel-2.1.0b6/ChangeLog	2007-03-18 16:24:11.000000000 +0100
+@@ -760 +760 @@
+-	Rathann Mierzejewski to check for src/.libs directories. Prevents
++	Dominik Mierzejewski to check for src/.libs directories. Prevents

openbabel-chicken.patch

@@ -1,23 +0,0 @@
---- openbabel-2.1.0b4/scripts/perl/Makefile.PL.chicken	2006-12-10 13:57:57.000000000 +0100
-+++ openbabel-2.1.0b4/scripts/perl/Makefile.PL	2006-12-18 00:45:12.000000000 +0100
-@@ -5,6 +5,8 @@
- 
- # check if we're compiling in the source directory
- $ldfrom = '$(OBJECT) -lopenbabel -lz';
-+$ldfrom = "\$(OBJECT) -L$srcdir/.libs -lopenbabel -lz"
-+    if (-r "$srcdir/.libs/libopenbabel.so") and (-s _) and (-B _);
- $ldfrom = "\$(OBJECT) $srcdir/.libs/libopenbabel.a -lz"
-     if (-r "$srcdir/.libs/libopenbabel.a") and (-s _) and (-B _);
- 
---- openbabel-2.1.0b4/scripts/python/setup.py.chicken	2006-12-10 13:58:47.000000000 +0100
-+++ openbabel-2.1.0b4/scripts/python/setup.py	2006-12-18 01:07:25.000000000 +0100
-@@ -31,6 +31,9 @@
- 	sys.stderr.write("INFO: Looking for library and include files in ../../src\n")
-         if os.path.isfile("../../src/atom.o"):
-             return ["../../include"],["../../src"]
-+        else:
-+            if os.path.isfile("../../src/atom.lo"):
-+                   return ["../../include"],["../../src/.libs"]
- 
-         for dirname in ["/usr/local","/usr"]:
-             # Look for each of these directories in turn for the directory include/openbabel-2.0

openbabel.spec

@@ -8,13 +8,13 @@
 
 Name: openbabel
 Version: 2.1.0
-Release: 0.1.b4%{?dist}
+Release: 0.2.b6%{?dist}
 Summary: Chemistry software file format converter
 License: GPL
 Group: Applications/File
 URL: http://openbabel.sourceforge.net/
-Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}b4.tar.gz
-Patch1: %{name}-chicken.patch
+Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}b6-20070301-r1814.tar.gz
+Patch: %{name}-changelog.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libtool
 BuildRequires: libxml2-devel
@@ -92,8 +92,8 @@ Summary: Python wrapper for the Open Babel library
 Python wrapper for the Open Babel library.
 
 %prep
-%setup -q -n %{name}-2.1.0b4
-%patch1 -p1 -b .chicken
+%setup -q -n %{name}-2.1.0b6
+%patch -p1 -b .cl
 
 %build
 autoreconf --force --install
@@ -116,6 +116,10 @@ popd
 
 %{__rm} -f $RPM_BUILD_ROOT%{_libdir}{,/%{name}}/*.la
 
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/inchi
+install -pm644 include/inchi_api.h $RPM_BUILD_ROOT%{_includedir}/inchi/
+sed -i 's/\r//' src/formats/inchi/COPYING.LIB
+
 pushd scripts/perl
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 popd
@@ -131,6 +135,9 @@ popd
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
+%check
+%{__make} check
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -159,7 +166,6 @@ popd
 %files -n inchi
 %defattr(-,root,root,-)
 %doc src/formats/inchi/COPYING.LIB
-%doc src/formats/inchi/README.html
 %{_libdir}/libinchi.so.*
 
 %files -n inchi-devel
@@ -180,6 +186,13 @@ popd
 %{python_sitearch}/pybel.py*
 
 %changelog
+* Sun Mar 18 2007 Dominik Mierzejewski <rpm@greysector.net> 2.1.0-0.2.b6
+- updated to beta6
+- dropped upstream'd patch
+- fixed my name in ChangeLog
+- copied inchi header for inchi-devel (TODO: make inchi a separate package)
+- added %%check
+
 * Sun Dec 17 2006 Dominik Mierzejewski <rpm@greysector.net> 2.1.0-0.1.b4
 - update to 2.1.0b4 to fix building with new python
 - dropped obsolete patch

sources

@@ -1 +1 @@
-c2ac565d77206f903fe04b119717a345  openbabel-2.1.0b4.tar.gz
+b425ef8508f090c45078c0f266344a25  openbabel-2.1.0b6-20070301-r1814.tar.gz