- added perl-x32.patch and python-x32.patch with fixes for x32

diff --git a/openbabel.spec b/openbabel.spec
index 8550f4559d71fbdd72b091cf732b9f93d7fbcc28..b578fba0fdbe2b318bd1ac2c5932a550df41e663 100644 (file)
--- a/openbabel.spec
+++ b/openbabel.spec
@@ -9,7 +9,7 @@ Summary:        A cross-platform chemistry program and library designed to convert file
 Summary(pl.UTF-8):     Międzyplatformowy program chemiczny i biblioteka do konwersji formatów plików
 Name:          openbabel
 Version:       2.3.2
-Release:       4
+Release:       5
 License:       GPL v2
 Group:         Libraries
 Source0:       http://downloads.sourceforge.net/openbabel/%{name}-%{version}.tar.gz
@@ -18,6 +18,8 @@ Patch0:               %{name}-prefix.patch
 Patch1:                ruby-gcc-no-option.patch
 Patch2:                cmake-fix.patch
 Patch3:                python-build.patch
+Patch4:                perl-x32.patch
+Patch5:                python-x32.patch
 URL:           http://openbabel.sourceforge.net/
 BuildRequires: cairo-devel
 BuildRequires: cmake >= 2.6.0
@@ -130,6 +132,8 @@ Wiązanie języka Ruby do biblioteki OpenBabel.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p0
+%patch4 -p1
+%patch5 -p1
 
 %build
 %cmake . \
@@ -150,6 +154,7 @@ Wiązanie języka Ruby do biblioteki OpenBabel.
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{py_sitedir}
 
 %{__make} install \
        RUBYARCHDIR=$RPM_BUILD_ROOT%{ruby_vendorarchdir} \

diff --git a/perl-x32.patch b/perl-x32.patch
new file mode 100644 (file)
index 0000000..89c80f7
--- /dev/null
+++ b/perl-x32.patch
@@ -0,0 +1,21 @@
+--- openbabel-2.3.2/scripts/perl/Makefile.PL.orig      2015-04-02 18:57:45.000000000 +0000
++++ openbabel-2.3.2/scripts/perl/Makefile.PL   2015-04-02 18:58:56.000000000 +0000
+@@ -15,6 +15,9 @@
+ elsif (-e "$cmakebindir/lib64/libopenbabel.so") {
+   check_lib_or_exit( lib => 'openbabel' , libpath => "$cmakebindir/lib64");
+ }
++elsif (-e "$cmakebindir/libx32/libopenbabel.so") {
++  check_lib_or_exit( lib => 'openbabel' , libpath => "$cmakebindir/libx32");
++}
+ else {
+   check_lib_or_exit( lib => 'openbabel' , libpath => @ENV{"LD_LIBRARY_PATH"});
+ }
+@@ -26,6 +29,8 @@
+     if (-r "$cmakebindir/lib/libopenbabel.so") and (-s _) and (-B _);
+ $ldfrom = "\$(OBJECT) -L$cmakebindir/lib64 -lopenbabel"
+     if (-r "$cmakebindir/lib64/libopenbabel.so") and (-s _) and (-B _);
++$ldfrom = "\$(OBJECT) -L$cmakebindir/libx32 -lopenbabel"
++    if (-r "$cmakebindir/libx32/libopenbabel.so") and (-s _) and (-B _);
+ 
+ # See lib/ExtUtils/MakeMaker.pm for details of how to influence
+ # the contents of the Makefile that is written.

diff --git a/python-x32.patch b/python-x32.patch
new file mode 100644 (file)
index 0000000..dd12a14
--- /dev/null
+++ b/python-x32.patch
@@ -0,0 +1,10 @@
+--- openbabel-2.3.2/scripts/python/setup.py.orig       2015-04-02 19:38:00.000000000 +0000
++++ openbabel-2.3.2/scripts/python/setup.py    2015-04-02 19:39:04.000000000 +0000
+@@ -20,6 +20,7 @@ obExtension = Extension('_openbabel',
+                                os.path.join("..", "include")],
+                  library_dirs=[os.path.join(srcdir, "..", "..", "lib"),
+                                os.path.join(srcdir, "..", "..", "lib64"),
++                               os.path.join(srcdir, "..", "..", "libx32"),
+                                os.path.join("..", "lib")],
+                  libraries=['openbabel']
+                  )