[Io-language] Fix compilation of python addon with python 2.7
Hans de Goede
jwrdegoede at fedoraproject.org
Sat Jul 31 09:42:35 UTC 2010
commit 140f99344c6bbfa67a49f5c8d39859320aaaed13
Author: Hans de Goede <hdegoede at redhat.com>
Date: Sat Jul 31 11:46:45 2010 +0200
Fix compilation of python addon with python 2.7
Io-language-20080330-py27.patch | 12 ++++++++++++
Io-language.spec | 7 ++++++-
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/Io-language-20080330-py27.patch b/Io-language-20080330-py27.patch
new file mode 100644
index 0000000..13d74c0
--- /dev/null
+++ b/Io-language-20080330-py27.patch
@@ -0,0 +1,12 @@
+diff -up stevedekorte-io-6a5f734/addons/Python/build.io~ stevedekorte-io-6a5f734/addons/Python/build.io
+--- stevedekorte-io-6a5f734/addons/Python/build.io~ 2008-03-30 06:16:50.000000000 +0200
++++ stevedekorte-io-6a5f734/addons/Python/build.io 2010-07-31 11:44:07.521779262 +0200
+@@ -1,7 +1,7 @@
+ AddonBuilder clone do(
+ dependsOnHeader("Python.h")
+
+- version := list("2.6", "2.5", "2.4", "2.3", "2.2") detect(v, System system("python" .. v .. " -V 2> /dev/null") == 0)
++ version := list("2.7", "2.6", "2.5", "2.4", "2.3", "2.2") detect(v, System system("python" .. v .. " -V 2> /dev/null") == 0)
+ version ifNil(version = "2.4")
+
+ dependsOnFrameworkOrLib("Python", "python" .. version)
diff --git a/Io-language.spec b/Io-language.spec
index a6ee61d..dae8efe 100644
--- a/Io-language.spec
+++ b/Io-language.spec
@@ -9,7 +9,7 @@
Name: Io-language
Version: 20080330
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Io is a small, prototype-based programming language
Group: System Environment/Libraries
License: BSD
@@ -19,6 +19,7 @@ Source0: %{name}-%{version}.tar.gz
Patch0: AddonBuilder_io_libdir.patch
Patch1: Io-2007-10-10-gcc43.patch
Patch2: Io-2007-10-10-missing-protos.patch
+Patch3: Io-language-20080330-py27.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: e2fsprogs-devel freetype-devel freeglut-devel gmp-devel
BuildRequires: libedit-devel libevent-devel libjpeg-devel libpng-devel
@@ -90,6 +91,7 @@ Io mysql bindings
%patch0 -p1
%patch1 -p1 -b .gcc43
%patch2 -p1 -b .protos
+%patch3 -p1
sed -i 's|/lib/io/addons|/%{_lib}/io/addons|g' libs/iovm/io/AddonLoader.io
# building Io while Io-language-devel is installed results in binaries getting
# linked against the installed version, instead of the just build one <sigh>
@@ -224,6 +226,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jul 31 2010 Hans de Goede <hdegoede at redhat.com> - 20080330-3
+- Fix compilation of python addon with python 2.7
+
* Fri Jul 30 2010 Hans de Goede <hdegoede at redhat.com> - 20080330-2
- Rebuild for python 2.7
More information about the scm-commits
mailing list