packages: openbabel/openbabel-prefix.patch, openbabel/openbabel.spec, openb...

Sat Oct 22 06:44:37 CEST 2011

Author: qboosh                       Date: Sat Oct 22 04:44:37 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.3.1
- updated prefix patch
- removed obsolete ruby,python,perl patches
- package ruby-openbabel binding

---- Files affected:
packages/openbabel:
   openbabel-prefix.patch (1.1 -> 1.2) , openbabel.spec (1.37 -> 1.38) , openbabel-perl.patch (1.1 -> NONE)  (REMOVED), openbabel-python.patch (1.2 -> NONE)  (REMOVED), openbabel-ruby.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/openbabel/openbabel-prefix.patch
diff -u packages/openbabel/openbabel-prefix.patch:1.1 packages/openbabel/openbabel-prefix.patch:1.2

--- packages/openbabel/openbabel-prefix.patch:1.1	Tue Jan 25 15:22:52 2011
+++ packages/openbabel/openbabel-prefix.patch	Sat Oct 22 06:44:32 2011
@@ -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")

================================================================
Index: packages/openbabel/openbabel.spec
diff -u packages/openbabel/openbabel.spec:1.37 packages/openbabel/openbabel.spec:1.38
--- packages/openbabel/openbabel.spec:1.37	Sun Feb 20 08:18:34 2011
+++ packages/openbabel/openbabel.spec	Sat Oct 22 06:44:32 2011
@@ -1,20 +1,18 @@
 # $Revision$, $Date$
 # 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
@@ -23,11 +21,11 @@
 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
@@ -93,12 +91,21 @@
 %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 . \
@@ -106,6 +113,7 @@
 	-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}
 
@@ -150,6 +158,7 @@
 %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*
@@ -167,14 +176,15 @@
 %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)
@@ -188,7 +198,11 @@
 %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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -196,6 +210,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2011/10/22 04:44:32  qboosh
+- updated to 2.3.1
+- updated prefix patch
+- removed obsolete ruby,python,perl patches
+- package ruby-openbabel binding
+
 Revision 1.37  2011/02/20 07:18:34  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openbabel/openbabel-prefix.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openbabel/openbabel.spec?r1=1.37&r2=1.38&f=u

