[Io-language] Latest upstream, fix FTBFS.

Jon Ciesla limb at fedoraproject.org
Thu Oct 30 17:21:28 UTC 2014


commit 1c2d5aa3dae02240520c2296b325ad184f2ba906
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Oct 30 12:21:22 2014 -0500

    Latest upstream, fix FTBFS.

 .gitignore       |    1 +
 Io-language.spec |   24 +++++++++++++++---------
 sources          |    2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4f4c187..3fab774 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 Io-language-20080330.tar.gz
 /stevedekorte-io-2011.09.12-0-g23afbcc.tar.gz
+/io-2013.12.04.tar.gz
diff --git a/Io-language.spec b/Io-language.spec
index a18e200..d8542f9 100644
--- a/Io-language.spec
+++ b/Io-language.spec
@@ -2,23 +2,24 @@
 %filter_from_requires /libiovmall.so$/d
 %filter_setup
 
-%define _version 2011.09.12
+%define _version 2013.12.04
  
 Name:           Io-language
-Version:        20110912
-Release:        14%{?dist}
+Version:        20131204
+Release:        1%{?dist}
 Summary:        Io is a small, prototype-based programming language
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.iolanguage.com/
 # To get this file do wget http://github.com/stevedekorte/io/tarball/%{_version}
+# and rename to io-%{version}.tar.gz
 #Source0:        %{name}-%{version}0-g23afbcc.tar.gz
-Source0:	stevedekorte-io-2011.09.12-0-g23afbcc.tar.gz
+Source0:	io-2013.12.04.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
-Patch4:         Io-language-20110912-arm.patch
+#Patch4:         Io-language-20110912-arm.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  e2fsprogs-devel freeglut-devel gmp-devel
 BuildRequires:  libedit-devel libevent-devel libjpeg-devel libpng-devel
@@ -93,12 +94,12 @@ Io mysql bindings
 
 
 %prep
-%setup -q -n stevedekorte-io-23afbcc
+%setup -q -n stevedekorte-io-f62cceb
 #%patch0 -p1
 %patch1 -p1 -b .gcc43
 #%patch2 -p1 -b .protos
 #%patch3 -p1
-%patch4 -p0
+#%patch4 -p0
 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>
@@ -110,6 +111,8 @@ fi
 #sed -i -e 's|dependsOnLib("stdc++")||g' addons/SoundTouch/build.io
 # remove add-ons which we do not want to build ever
 rm -fr addons/AVCodec
+rm -rf addons/ODE
+sed -i /ODE/d addons/CMakeLists.txt
 # for %doc
 #mv addons/OpenGL/docs OpenGL
 iconv -f MACINTOSH -t UTF8 libs/basekit/license/bsd_license.txt > license.txt
@@ -197,11 +200,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/io/addons/Bitly
 %{_libdir}/io/addons/Blowfish
 %{_libdir}/io/addons/Box
-#%{_libdir}/io/addons/Cairo
+%{_libdir}/io/addons/Cairo
 #%{_libdir}/io/addons/CFFI
 %{_libdir}/io/addons/CGI
 %{_libdir}/io/addons/ContinuedFraction
-%{_libdir}/io/addons/Curses
+#%{_libdir}/io/addons/Curses
 %{_libdir}/io/addons/DBI
 %{_libdir}/io/addons/DistributedObjects
 %{_libdir}/io/addons/EditLine
@@ -276,6 +279,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Oct 30 2014 Jon Ciesla <limburgher at gmail.com> - 20131204-1
+- Fix FTBFS, BZ 1105914.
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 20110912-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index 9c7c269..60e8413 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b5c4b4117e43b4bbe571e4e12018535b  stevedekorte-io-2011.09.12-0-g23afbcc.tar.gz
+381dcaf719606e371ad05dc3056e8b13  io-2013.12.04.tar.gz


More information about the scm-commits mailing list