- updated to 2.3.1

- updated prefix patch
- removed obsolete ruby,python,perl patches
- package ruby-openbabel binding

Changed files:
    openbabel-perl.patch -> 1.2
    openbabel-prefix.patch -> 1.2
    openbabel-python.patch -> 1.3
    openbabel-ruby.patch -> 1.2
    openbabel.spec -> 1.38

diff --git a/openbabel-perl.patch b/openbabel-perl.patch
deleted file mode 100644 (file)
index e29f67c..0000000
--- a/openbabel-perl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openbabel-2.3.0/scripts/CMakeLists.txt.orig        2011-01-24 17:41:51.482363293 +0100
-+++ openbabel-2.3.0/scripts/CMakeLists.txt     2011-01-24 20:16:28.550361617 +0100
-@@ -223,7 +223,7 @@
-         COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/Makefile.PL ${openbabel_BINARY_DIR}/scripts/perl
-         COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/OpenBabel.pm ${openbabel_BINARY_DIR}/scripts/perl
-         COMMAND ${CMAKE_COMMAND} -E copy ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp ${openbabel_BINARY_DIR}/scripts/perl
--        COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL ${PERL_PREFIX_TEXT}
-+      COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc SRC_DIR=${openbabel_SOURCE_DIR} OBJ_DIR=${openbabel_BINARY_DIR} ${PERL_EXECUTABLE} ${openbabel_BINARY_DIR}/scripts/perl/Makefile.PL INSTALLDIRS=vendor
-         COMMAND PERL5LIB=${openbabel_SOURCE_DIR}/scripts/perl/inc make 
-             DEPENDS ${openbabel_SOURCE_DIR}/scripts/perl/openbabel-perl.cpp
-             WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts/perl

diff --git a/openbabel-prefix.patch b/openbabel-prefix.patch
index 9a5eacf24da03b0bafe1e3e01b29798a923da42c..048f253a35b0a53a1cfc726a979a9e463c87d701 100644 (file)
--- a/openbabel-prefix.patch
+++ b/openbabel-prefix.patch
@@ -1,5 +1,5 @@
---- openbabel-2.3.0/CMakeLists.txt.orig        2010-10-23 00:05:07.000000000 +0200
-+++ openbabel-2.3.0/CMakeLists.txt     2011-01-24 17:39:04.922359941 +0100
+--- openbabel-2.3.1/CMakeLists.txt.orig        2011-09-15 21:45:59.000000000 +0200
++++ openbabel-2.3.1/CMakeLists.txt     2011-10-21 17:52:35.278016550 +0200
 @@ -45,17 +45,17 @@
    CACHE PATH "Install dir for binaries")
  set(LIB_SUFFIX "" CACHE STRING "Suffix of the directory name, e.g. 64 for lib64")
@@ -22,7 +22,7 @@
        CACHE PATH "Install dir for libraries")
    if(MSVC)
      set(OB_PLUGIN_INSTALL_DIR "${BIN_INSTALL_DIR}"
-@@ -321,9 +321,9 @@
+@@ -351,9 +351,9 @@
  # Some rpath handling for Linux and Mac
  if(UNIX AND BUILD_SHARED)
    if(APPLE)
@@ -34,12 +34,12 @@
      set(CMAKE_SKIP_BUILD_RPATH FALSE)
      set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-@@ -450,7 +450,7 @@
+@@ -487,7 +487,7 @@
    "${openbabel_BINARY_DIR}/OpenBabel2ConfigVersion.cmake" @ONLY)
  
  # Now to configure the installed config file.
--set(OB_CONFIG_DIR "${LIB_INSTALL_DIR}/openbabel")
-+set(OB_CONFIG_DIR "${OBLIB_INSTALL_DIR}/openbabel")
+-set(OB_CONFIG_DIR "${LIB_INSTALL_DIR}/cmake/openbabel2")
++set(OB_CONFIG_DIR "${OBLIB_INSTALL_DIR}/cmake/openbabel2")
  set(OpenBabel2_INCLUDE_DIRS "\${OpenBabel2_INSTALL_PREFIX}/${OB_INCLUDE_DIRS}")
  set(OB_EXPORTS_FILE
    "\${OpenBabel2_INSTALL_PREFIX}/${OB_CONFIG_DIR}/OpenBabel2_EXPORTS.cmake")

diff --git a/openbabel-python.patch b/openbabel-python.patch
deleted file mode 100644 (file)
index 7a3324c..0000000
--- a/openbabel-python.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- openbabel-2.3.0/scripts/CMakeLists.txt.orig        2010-10-25 19:37:42.000000000 +0200
-+++ openbabel-2.3.0/scripts/CMakeLists.txt     2011-01-24 17:32:52.634356589 +0100
-@@ -84,12 +84,12 @@
-             VERBATIM)
- 
-         if (PYTHON_PREFIX)
--            install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${PYTHON_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
-+              install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${PYTHON_PREFIX} --root=\$ENV{DESTDIR} --optimize=2 WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
-         else (PYTHON_PREFIX)
-             if (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
--                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
-+                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --root=\$ENV{DESTDIR} --optimize=2 WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
-             else (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
--                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
-+                install(CODE "execute_process(COMMAND ${PYTHON_EXECUTABLE} ${openbabel_SOURCE_DIR}/scripts/python/setup.py install --prefix=${CMAKE_INSTALL_PREFIX} --root=\$ENV{DESTDIR} --optimize=2 WORKING_DIRECTORY ${openbabel_BINARY_DIR}/scripts)")
-             endif (${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local")
-         endif (PYTHON_PREFIX)
- 

diff --git a/openbabel-ruby.patch b/openbabel-ruby.patch
deleted file mode 100644 (file)
index 648177f..0000000
--- a/openbabel-ruby.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- openbabel-2.3.0/scripts/ruby/extconf.rb.orig       2010-10-23 03:54:40.000000000 +0200
-+++ openbabel-2.3.0/scripts/ruby/extconf.rb    2011-01-15 10:45:27.430364132 +0100
-@@ -5,8 +5,10 @@
- require 'rbconfig'
- if Config::CONFIG["arch"] =~ /universal-darwin/
-   case `uname -smr`.chomp
--  when "i386" : ENV['ARCHFLAGS'] = '-arch i386'
--  when "ppc"  : ENV['ARCHFLAGS'] = '-arch ppc'
-+  when "i386"
-+      ENV['ARCHFLAGS'] = '-arch i386'
-+  when "ppc"
-+      ENV['ARCHFLAGS'] = '-arch ppc'
-   end
- end
- 

diff --git a/openbabel.spec b/openbabel.spec
index 9d52261fda603dafcb98737c9ba4382ff8f2f3e7..c4a0d214fbd5f33fc19fcfd2231a896d96252872 100644 (file)
--- a/openbabel.spec
+++ b/openbabel.spec
@@ -1,19 +1,17 @@
 # TODO:
-# - install+package ruby, java, csharp bindings
+# - install+package java, csharp bindings
 Summary:       A cross-platform chemistry program and library designed to convert file formats
 Summary(pl.UTF-8):     Międzyplatformowy program chemiczny i biblioteka do konwersji formatów plików
 Name:          openbabel
-Version:       2.3.0
-Release:       2
+Version:       2.3.1
+Release:       1
 License:       GPL v2
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/openbabel/%{name}-%{version}.tar.gz
-# Source0-md5: effda01ed4a31d18d8e3d08191799608
-Patch0:                %{name}-ruby.patch
-Patch1:                %{name}-python.patch
-Patch2:                %{name}-prefix.patch
-Patch3:                %{name}-perl.patch
+# Source0-md5: 1f029b0add12a3b55582dc2c832b04f8
+Patch0:                %{name}-prefix.patch
 URL:           http://openbabel.sourceforge.net/
+BuildRequires: cairo-devel
 BuildRequires: cmake >= 2.6.0
 BuildRequires: eigen >= 2
 BuildRequires: libstdc++-devel
@@ -22,11 +20,11 @@ BuildRequires:      perl-devel
 BuildRequires: rpm-perlprov
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.577
+BuildRequires: ruby-devel
 BuildRequires: wxGTK2-devel
 BuildRequires: zlib-devel
 #BuildRequires:        jdk
 #BuildRequires:        mono-csharp
-#BuildRequires:        ruby-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -92,12 +90,21 @@ Python binding for OpenBabel.
 %description -n python-openbabel -l pl.UTF-8
 Wiązanie Pythona do biblioteki OpenBabel.
 
+%package -n ruby-openbabel
+Summary:       Ruby binding for OpenBabel
+Summary(pl.UTF-8):     Wiązanie języka Ruby do biblioteki OpenBabel
+Group:         Development/Languages
+Requires:      %{name} = %{version}-%{release}
+
+%description -n ruby-openbabel
+Ruby binding for OpenBabel.
+
+%description -n ruby-openbabel -l pl.UTF-8
+Wiązanie języka Ruby do biblioteki OpenBabel.
+
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 %cmake . \
@@ -105,6 +112,7 @@ Wiązanie Pythona do biblioteki OpenBabel.
        -DCSHARP_EXECUTABLE=/usr/bin/mcs \
        -DCMAKE_C_FLAGS_RELEASE="-DNDEBUG" \
        -DCMAKE_CXX_FLAGS_RELEASE="-DNDEBUG" \
+       -DOBPERL_INSTALLDIRS="vendor" \
        -DwxWidgets_CONFIG_EXECUTABLE=%{_bindir}/wx-gtk2-unicode-config
 %{__make}
 
@@ -149,6 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/openbabel/%{version}/*.so
 %{_datadir}/openbabel
 %{_mandir}/man1/babel.1*
+%{_mandir}/man1/obabel.1*
 %{_mandir}/man1/obchiral.1*
 %{_mandir}/man1/obconformer.1*
 %{_mandir}/man1/obenergy.1*
@@ -166,14 +175,15 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libinchi.so
 %attr(755,root,root) %{_libdir}/libopenbabel.so
-%{_libdir}/openbabel/OpenBabel2*.cmake
 %{_includedir}/inchi
 %{_includedir}/openbabel-2.0
 %{_pkgconfigdir}/openbabel-2.0.pc
+%{_libdir}/cmake/openbabel2
 
 %files gui
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/OBGUI
+%attr(755,root,root) %{_bindir}/obgui
+%{_mandir}/man1/OBGUI.1*
 
 %files -n perl-Chemistry-OpenBabel
 %defattr(644,root,root,755)
@@ -187,4 +197,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{py_sitedir}/_openbabel.so
 %{py_sitedir}/openbabel.py[co]
 %{py_sitedir}/pybel.py[co]
-%{py_sitedir}/openbabel-1.6-py*.egg-info
+%{py_sitedir}/openbabel-1.7-py*.egg-info
+
+%files -n ruby-openbabel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{ruby_sitearchdir}/openbabel.so