rpms/openbabel/devel openbabel.spec,1.11,1.12

[Dominik Mierzejewski (rathann)]

Author: rathann

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

Modified Files:
	openbabel.spec 
Log Message:
- build against external inchi


Index: openbabel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openbabel/devel/openbabel.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openbabel.spec	17 Aug 2007 00:45:37 -0000	1.11
+++ openbabel.spec	28 Nov 2007 18:28:34 -0000	1.12
@@ -3,18 +3,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
-%define inchi_ver 1.0.1
-%define inchi_rel 8
-
 Name: openbabel
 Version: 2.1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Chemistry software file format converter
 License: GPLv2
 Group: Applications/File
 URL: http://openbabel.sourceforge.net/
 Source: http://dl.sourceforge.net/sourceforge/openbabel/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: inchi-devel
 BuildRequires: libtool
 BuildRequires: libxml2-devel
 BuildRequires: perl(ExtUtils::MakeMaker)
@@ -52,32 +50,6 @@
 you should install %{name}-devel.  You'll also need to have the
 %{name} package installed.
 
-%package -n inchi
-Summary: The IUPAC International Chemical Identifier (InChI) library
-Group: System Environment/Libraries
-License: LGPLv2
-Version: %{inchi_ver}
-Release: %{inchi_rel}%{?dist}
-
-%description -n inchi
-The IUPAC International Chemical Identifier (InChI) library.
-
-%package -n inchi-devel
-Summary: Development headers for InChI library
-Group: Development/Libraries
-License: LGPLv2
-Version: %{inchi_ver}
-Release: %{inchi_rel}%{?dist}
-Requires: inchi = %{inchi_ver}-%{inchi_rel}%{?dist}
-
-%description -n inchi-devel
-The inchi-devel package includes the header files and libraries
-necessary for developing programs using the InChI library.
-
-If you are going to develop programs which will use this library
-you should install inchi-devel.  You'll also need to have the
-inchi package installed.
-
 %package perl
 Group: System Environment/Libraries
 Summary: Perl wrapper for the Open Babel library
@@ -116,10 +88,6 @@
 
 %{__rm} $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
@@ -146,10 +114,6 @@
 
 %postun -p /sbin/ldconfig
 
-%post -n inchi -p /sbin/ldconfig
-
-%postun -n inchi -p /sbin/ldconfig
-
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README THANKS
@@ -167,16 +131,6 @@
 %{_libdir}/libopenbabel.so
 %{_libdir}/pkgconfig/*.pc
 
-%files -n inchi
-%defattr(-,root,root,-)
-%doc src/formats/inchi/COPYING.LIB
-%{_libdir}/libinchi.so.*
-
-%files -n inchi-devel
-%defattr(-,root,root,-)
-%{_includedir}/inchi
-%{_libdir}/libinchi.so
-
 %files perl
 %defattr(-,root,root,-)
 %{perl_vendorarch}/Chemistry/OpenBabel.pm
@@ -190,6 +144,9 @@
 %{python_sitearch}/pybel.py*
 
 %changelog
+* Wed Nov 28 2007 Dominik Mierzejewski <rpm at greysector.net> 2.1.1-2
+- build against external inchi
+
 * Fri Aug 17 2007 Dominik Mierzejewski <rpm at greysector.net> 2.1.1-1
 - updated to 2.1.1
 - better work around for testsuite crash