packages: openbabel/openbabel.spec, openbabel/openbabel-perl.patch (NEW), o...

qboosh qboosh at pld-linux.org
Tue Jan 25 15:22:58 CET 2011 

Author: qboosh                       Date: Tue Jan 25 14:22:58 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added prefix,perl,python patches
- now perl binding is packaged; python still broken

---- Files affected:
packages/openbabel:
   openbabel.spec (1.30 -> 1.31) , openbabel-perl.patch (NONE -> 1.1)  (NEW), openbabel-prefix.patch (NONE -> 1.1)  (NEW), openbabel-python.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/openbabel/openbabel.spec
diff -u packages/openbabel/openbabel.spec:1.30 packages/openbabel/openbabel.spec:1.31
--- packages/openbabel/openbabel.spec:1.30	Sun Jan 23 20:56:31 2011
+++ packages/openbabel/openbabel.spec	Tue Jan 25 15:22:52 2011
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO:
-# - eigen2
 # - wxWidgets (cmake needs hacking to use wx-gtk2-unicode-config instead of wx-config)
 # - install+package python, ruby, java, csharp bindings
 Summary:	A cross-platform chemistry program and library designed to convert file formats
@@ -13,8 +12,12 @@
 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
 URL:		http://openbabel.sourceforge.net/
-BuildRequires:	cmake >= 2.4.8
+BuildRequires:	cmake >= 2.6.0
+BuildRequires:	eigen >= 2
 BuildRequires:	libstdc++-devel
 BuildRequires:	libxml2-devel >= 2.6.5
 BuildRequires:	perl-devel
@@ -65,6 +68,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 %cmake . \
@@ -147,6 +153,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2011/01/25 14:22:52  qboosh
+- added prefix,perl,python patches
+- now perl binding is packaged; python still broken
+
 Revision 1.30  2011/01/23 19:56:31  qboosh
 - macros for cmake macro
 

================================================================
Index: packages/openbabel/openbabel-perl.patch
diff -u /dev/null packages/openbabel/openbabel-perl.patch:1.1
--- /dev/null	Tue Jan 25 15:22:58 2011
+++ packages/openbabel/openbabel-perl.patch	Tue Jan 25 15:22:52 2011
@@ -0,0 +1,11 @@
+--- 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

================================================================
Index: packages/openbabel/openbabel-prefix.patch
diff -u /dev/null packages/openbabel/openbabel-prefix.patch:1.1
--- /dev/null	Tue Jan 25 15:22:58 2011
+++ packages/openbabel/openbabel-prefix.patch	Tue Jan 25 15:22:52 2011
@@ -0,0 +1,45 @@
+--- 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
+@@ -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")
+ if(UNIX)
+-  set(LIB_INSTALL_DIR    "lib${LIB_SUFFIX}"
++  set(OBLIB_INSTALL_DIR    "lib${LIB_SUFFIX}"
+     CACHE PATH "Install dir for libraries")
+   if(ENABLE_VERSIONED_FORMATS)
+-    set(OB_PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/openbabel/${BABEL_VERSION}"
++    set(OB_PLUGIN_INSTALL_DIR "${OBLIB_INSTALL_DIR}/openbabel/${BABEL_VERSION}"
+       CACHE PATH "Install dir for plugins")
+   else()
+-    set(OB_PLUGIN_INSTALL_DIR "${LIB_INSTALL_DIR}/openbabel"
++    set(OB_PLUGIN_INSTALL_DIR "${OBLIB_INSTALL_DIR}/openbabel"
+       CACHE PATH "Install dir for plugins")
+   endif()
+ else() # Windows - bin dir = lib dir to load libraries
+-  set(LIB_INSTALL_DIR "${BIN_INSTALL_DIR}"
++  set(OBLIB_INSTALL_DIR "${BIN_INSTALL_DIR}"
+       CACHE PATH "Install dir for libraries")
+   if(MSVC)
+     set(OB_PLUGIN_INSTALL_DIR "${BIN_INSTALL_DIR}"
+@@ -321,9 +321,9 @@
+ # Some rpath handling for Linux and Mac
+ if(UNIX AND BUILD_SHARED)
+   if(APPLE)
+-    set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR})
++    set(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_PREFIX}/${OBLIB_INSTALL_DIR})
+   else()
+-    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
++    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBLIB_INSTALL_DIR}")
+     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 @@
+   "${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(OpenBabel2_INCLUDE_DIRS "\${OpenBabel2_INSTALL_PREFIX}/${OB_INCLUDE_DIRS}")
+ set(OB_EXPORTS_FILE
+   "\${OpenBabel2_INSTALL_PREFIX}/${OB_CONFIG_DIR}/OpenBabel2_EXPORTS.cmake")

================================================================
Index: packages/openbabel/openbabel-python.patch
diff -u /dev/null packages/openbabel/openbabel-python.patch:1.1
--- /dev/null	Tue Jan 25 15:22:58 2011
+++ packages/openbabel/openbabel-python.patch	Tue Jan 25 15:22:52 2011
@@ -0,0 +1,11 @@
+--- 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,7 +84,7 @@
+             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} 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)")
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openbabel/openbabel.spec?r1=1.30&r2=1.31&f=u

More information about the pld-cvs-commit mailing list