[Io-language] Update to 2011.09.12.
Jon Ciesla
limb at fedoraproject.org
Mon May 7 17:56:58 UTC 2012
commit c0d77c276e56e198f00bf1ce6d888f01dc91f381
Author: Jon Ciesla <limburgher at gmail.com>
Date: Mon May 7 12:56:27 2012 -0500
Update to 2011.09.12.
.gitignore | 1 +
Io-language.spec | 119 ++++++++++++++++++++++++++++++++++++++---------------
sources | 2 +-
3 files changed, 87 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8f647ef..4f4c187 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
Io-language-20080330.tar.gz
+/stevedekorte-io-2011.09.12-0-g23afbcc.tar.gz
diff --git a/Io-language.spec b/Io-language.spec
index 49e6722..8c68834 100644
--- a/Io-language.spec
+++ b/Io-language.spec
@@ -1,33 +1,38 @@
-# Copyright (c) 2007 oc2pus <toni at links2linux.de>
-# Copyright (c) 2007-2009 Hans de Goede <hdegoede at redhat.com>
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments to us at the above email addresses
-
-%define _version 2008.03.30
+%filter_from_provides /libiovmall.so$/d
+%filter_from_requires /libiovmall.so$/d
+%filter_setup
+
+%define _version 2011.09.12
Name: Io-language
-Version: 20080330
-Release: 9%{?dist}.2
+Version: 20110912
+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}
-Source0: %{name}-%{version}.tar.gz
-Patch0: AddonBuilder_io_libdir.patch
+#Source0: %{name}-%{version}0-g23afbcc.tar.gz
+Source0: stevedekorte-io-2011.09.12-0-g23afbcc.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
+#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: e2fsprogs-devel freeglut-devel gmp-devel
BuildRequires: libedit-devel libevent-devel libjpeg-devel libpng-devel
BuildRequires: libsamplerate-devel libsndfile-devel libtiff-devel
-BuildRequires: libxml2-devel mysql-devel ode-devel opensp-devel pcre-devel
+BuildRequires: libxml2-devel ode-devel opensp-devel pcre-devel
BuildRequires: portaudio-devel postgresql-devel python-devel soundtouch-devel
BuildRequires: sqlite-devel taglib-devel ncurses-devel cairo-devel
-BuildRequires: libuuid-devel readline-devel
+BuildRequires: libuuid-devel readline-devel cmake libogg-devel
+BuildRequires: mesa-libGLU-devel libffi-devel libdbi-devel loudmouth-devel
+BuildRequires: libmemcached-devel libgle-devel libtheora-devel
+BuildRequires: tokyocabinet-devel libvorbis-devel
+BuildRequires: yajl-devel >= 2
+# Put back freetype-devel, clutter-devel, mysql-devel, qdbm-devel,
+# openssl-devel when these extensions build
+
%description
Io is a small, prototype-based programming language. The ideas in
@@ -87,11 +92,11 @@ Io mysql bindings
%prep
-%setup -q -n stevedekorte-io-6a5f734
-%patch0 -p1
+%setup -q -n stevedekorte-io-23afbcc
+#%patch0 -p1
%patch1 -p1 -b .gcc43
-%patch2 -p1 -b .protos
-%patch3 -p1
+#%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>
@@ -100,11 +105,11 @@ if [ -f /usr/include/io/IoVM.h ]; then
exit 1
fi
# libstdc++.so is searched and not found ...
-sed -i -e 's|dependsOnLib("stdc++")||g' addons/SoundTouch/build.io
+#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
# for %doc
-mv addons/OpenGL/docs OpenGL
+#mv addons/OpenGL/docs OpenGL
iconv -f MACINTOSH -t UTF8 libs/basekit/license/bsd_license.txt > license.txt
sed -i 's/\r//g' license.txt `find OpenGL -type f`
# for debuginfo
@@ -112,6 +117,7 @@ chmod -x addons/NullAddon/source/IoNullAddon.?
%build
+cmake . ##-DCMAKE_INSTALL_PREFIX=$RPM_BUILD_ROOT%{_prefix}
make %{?_smp_mflags} INSTALL_PREFIX=%{_prefix} OPTIMIZE="$RPM_OPT_FLAGS" \
DLL_COMMAND='-shared -Wl,-soname="libiovmall.so.2"'
@@ -119,14 +125,34 @@ make %{?_smp_mflags} INSTALL_PREFIX=%{_prefix} OPTIMIZE="$RPM_OPT_FLAGS" \
%install
rm -rf $RPM_BUILD_ROOT
# upstreams make install installs lots of unwanted parts of the addons, so DIY
+#make install
+
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/addons
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
install -m 755 _build/binaries/io $RPM_BUILD_ROOT%{_bindir}
+install -m 755 _build/binaries/io_static $RPM_BUILD_ROOT%{_bindir}
+
+
+#rm $RPM_BUILD_ROOT%{_libdir}/libiovmall.so
install -m 755 _build/dll/libiovmall.so \
$RPM_BUILD_ROOT%{_libdir}/libiovmall.so.2
ln -s libiovmall.so.2 $RPM_BUILD_ROOT%{_libdir}/libiovmall.so
+
+install -m 755 _build/dll/libbasekit.so $RPM_BUILD_ROOT%{_libdir}/
+install -m 755 _build/dll/libcoroutine.so $RPM_BUILD_ROOT%{_libdir}/
+install -m 755 _build/dll/libgarbagecollector.so $RPM_BUILD_ROOT%{_libdir}/
+
+mkdir -p $RPM_BUILD_ROOT%{_includedir}
cp -a _build/headers $RPM_BUILD_ROOT%{_includedir}/io
+
+# Clean out addons that don't build.
+rm -rf addons/Clutter
+rm -rf addons/Font
+rm -rf addons/GLFW
+rm -rf addons/MySQL
+rm -rf addons/QDBM
+rm -rf addons/SecureSocket
+
# install the addons
for i in addons/*; do
# skip unbuild addons
@@ -155,42 +181,62 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%doc license.txt
%{_bindir}/io
+%{_bindir}/io_static
%{_libdir}/libiovmall.so.2
+%{_libdir}/libbasekit.so
+%{_libdir}/libcoroutine.so
+%{_libdir}/libgarbagecollector.so
+
+
%dir %{_libdir}/io
%dir %{_libdir}/io/addons
%{_libdir}/io/addons/AsyncRequest
%{_libdir}/io/addons/BigNum
+%{_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/DBI
%{_libdir}/io/addons/DistributedObjects
%{_libdir}/io/addons/EditLine
+%{_libdir}/io/addons/Facebook
%{_libdir}/io/addons/Flux
%{_libdir}/io/addons/Fnmatch
+%{_libdir}/io/addons/GoogleSearch
+%{_libdir}/io/addons/HttpClient
%{_libdir}/io/addons/LZO
%{_libdir}/io/addons/Libxml2
%{_libdir}/io/addons/Loki
+%{_libdir}/io/addons/Loudmouth
%{_libdir}/io/addons/MD5
-%{_libdir}/io/addons/NetworkAdapter
+%{_libdir}/io/addons/Memcached
+#%{_libdir}/io/addons/NetworkAdapter
%{_libdir}/io/addons/NotificationCenter
-%{_libdir}/io/addons/NullAddon
+#%{_libdir}/io/addons/NullAddon
+%{_libdir}/io/addons/Obsidian
%{_libdir}/io/addons/Random
%{_libdir}/io/addons/Range
%{_libdir}/io/addons/Rational
%{_libdir}/io/addons/ReadLine
%{_libdir}/io/addons/Regex
+%{_libdir}/io/addons/SGML
%{_libdir}/io/addons/SHA1
%{_libdir}/io/addons/SQLite3
%{_libdir}/io/addons/SqlDatabase
%{_libdir}/io/addons/Syslog
%{_libdir}/io/addons/SystemCall
%{_libdir}/io/addons/Thread
+%{_libdir}/io/addons/TokyoCabinet
+%{_libdir}/io/addons/Twitter
%{_libdir}/io/addons/UUID
%{_libdir}/io/addons/User
+%{_libdir}/io/addons/VertexDB
%{_libdir}/io/addons/Volcano
+%{_libdir}/io/addons/Yajl
%{_libdir}/io/addons/Zlib
%files devel
@@ -201,20 +247,22 @@ rm -rf $RPM_BUILD_ROOT
%files graphics-and-sound
%defattr(-,root,root,-)
-%doc OpenGL
-%{_libdir}/io/addons/Font
+#%{_libdir}/io/addons/Font
%{_libdir}/io/addons/Image
%{_libdir}/io/addons/LibSndFile
+%{_libdir}/io/addons/Ogg
%{_libdir}/io/addons/OpenGL
-%{_libdir}/io/addons/PortAudio
-%{_libdir}/io/addons/TagLib
+#%{_libdir}/io/addons/PortAudio
+#%{_libdir}/io/addons/TagLib
+%{_libdir}/io/addons/Theora
+%{_libdir}/io/addons/Vorbis
%files extras
%defattr(-,root,root,-)
%{_libdir}/io/addons/Python
-%{_libdir}/io/addons/SampleRateConverter
+#%{_libdir}/io/addons/SampleRateConverter
%{_libdir}/io/addons/Socket
-%{_libdir}/io/addons/SoundTouch
+#%{_libdir}/io/addons/SoundTouch
%files postgresql
%defattr(-,root,root,-)
@@ -222,10 +270,13 @@ rm -rf $RPM_BUILD_ROOT
%files mysql
%defattr(-,root,root,-)
-%{_libdir}/io/addons/MySQL
+#%{_libdir}/io/addons/MySQL
%changelog
+* Tue Apr 10 2012 Jon Ciesla <limburgher at gmail.com> - 20110912-1
+- Latest upstream.
+
* Fri Feb 10 2012 Petr Pisar <ppisar at redhat.com> - 20080330-9.2
- Rebuild against PCRE 8.30
diff --git a/sources b/sources
index 597aaf8..9c7c269 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c0338aea770c836811b1be6a0d372373 Io-language-20080330.tar.gz
+b5c4b4117e43b4bbe571e4e12018535b stevedekorte-io-2011.09.12-0-g23afbcc.tar.gz
More information about the scm-commits
mailing list