rpms/Io-language/devel .cvsignore, 1.3, 1.4 Io-2007-10-10-gcc43.patch, 1.1, 1.2 Io-2007-10-10-missing-protos.patch, 1.1, 1.2 Io-language.spec, 1.14, 1.15 sources, 1.3, 1.4

Hans de Goede jwrdegoede at fedoraproject.org
Fri Jan 15 13:59:56 UTC 2010 

Author: jwrdegoede

Update of /cvs/pkgs/rpms/Io-language/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv894

Modified Files:
	.cvsignore Io-2007-10-10-gcc43.patch 
	Io-2007-10-10-missing-protos.patch Io-language.spec sources 
Log Message:
* Fri Jan 15 2010 Hans de Goede <hdegoede at redhat.com> - 20080330-1
- Rebase to latest upstream release 20080330
- Bump soname because of ABI change
- Fix FTBFS (#511617)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Io-language/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	11 Nov 2007 21:20:40 -0000	1.3
+++ .cvsignore	15 Jan 2010 13:59:55 -0000	1.4
@@ -1 +1 @@
-Io-2007-10-10.tar.gz
+Io-language-20080330.tar.gz

Io-2007-10-10-gcc43.patch:
 IoState_inline.h |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: Io-2007-10-10-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Io-language/devel/Io-2007-10-10-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Io-2007-10-10-gcc43.patch	12 Jan 2008 11:10:15 -0000	1.1
+++ Io-2007-10-10-gcc43.patch	15 Jan 2010 13:59:56 -0000	1.2
@@ -1,8 +1,9 @@
---- Io-2007-10-10/libs/iovm/source/IoState_inline.h	2007-09-23 04:09:53.000000000 +0200
-+++ Io-2007-10-10.new/libs/iovm/source/IoState_inline.h	2008-01-12 11:57:52.000000000 +0100
-@@ -3,6 +3,9 @@
- docLicense("BSD revised")
- */
+diff -up stevedekorte-io-6a5f734/libs/iovm/source/IoState_inline.h.gcc43 stevedekorte-io-6a5f734/libs/iovm/source/IoState_inline.h
+--- stevedekorte-io-6a5f734/libs/iovm/source/IoState_inline.h.gcc43	2008-03-30 06:16:50.000000000 +0200
++++ stevedekorte-io-6a5f734/libs/iovm/source/IoState_inline.h	2010-01-15 12:27:55.000000000 +0100
+@@ -2,6 +2,9 @@
+ //metadoc State copyright Steve Dekorte 2002
+ //metadoc State license BSD revised
  
 +#ifndef __IOSTATE_INLINE_H
 +#define __IOSTATE_INLINE_H
@@ -10,16 +11,7 @@
  #ifdef IOSTATE_C
  #define IO_IN_C_FILE
  #endif
-@@ -33,8 +36,6 @@
- #define IOFAILURE(self) IOFALSE(self)
- #define ISFAILURE(self) ISFALSE(self)
- 
--inline IoObject *IOBOOL(IoObject *self, int b);
--
- #if !defined(IoObjectDataDefined)
- typedef struct IoObjectData IoObjectData;
- #endif
-@@ -59,7 +60,7 @@
+@@ -58,7 +61,7 @@ IOINLINE int ISFALSE(IoObject *self)
  	return self == IOSTATE->ioNil || self == IOSTATE->ioFalse;
  }
  
@@ -28,7 +20,7 @@
  {
  	return b ? IOTRUE(self) : IOFALSE(self);
  }
-@@ -322,6 +323,8 @@
+@@ -321,6 +324,8 @@ IOINLINE int IoState_stopStatusNumber(Io
  }
  
  

Io-2007-10-10-missing-protos.patch:
 basekit/source/UArray.h           |    6 ++++++
 basekit/source/UArray_character.c |    1 +
 basekit/source/UArray_string.c    |    1 +
 iovm/source/IoMessage_opShuffle.c |    1 +
 4 files changed, 9 insertions(+)

Index: Io-2007-10-10-missing-protos.patch
===================================================================
RCS file: /cvs/pkgs/rpms/Io-language/devel/Io-2007-10-10-missing-protos.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- Io-2007-10-10-missing-protos.patch	30 Mar 2008 19:55:35 -0000	1.1
+++ Io-2007-10-10-missing-protos.patch	15 Jan 2010 13:59:56 -0000	1.2
@@ -1,28 +1,6 @@
-diff -up Io-2007-10-10/libs/iovm/source/IoMessage_opShuffle.c~ Io-2007-10-10/libs/iovm/source/IoMessage_opShuffle.c
---- Io-2007-10-10/libs/iovm/source/IoMessage_opShuffle.c~	2008-03-30 21:46:23.000000000 +0200
-+++ Io-2007-10-10/libs/iovm/source/IoMessage_opShuffle.c	2008-03-30 21:46:23.000000000 +0200
-@@ -6,6 +6,7 @@
- #include "IoMessage_opShuffle.h"
- #include "IoMap.h"
- #include "IoNumber.h"
-+#include <ctype.h>
- 
- #define DATA(self) ((IoMessageData *)IoObject_dataPointer(self))
- 
-diff -up Io-2007-10-10/libs/basekit/source/UArray_string.c~ Io-2007-10-10/libs/basekit/source/UArray_string.c
---- Io-2007-10-10/libs/basekit/source/UArray_string.c~	2008-03-30 21:43:58.000000000 +0200
-+++ Io-2007-10-10/libs/basekit/source/UArray_string.c	2008-03-30 21:43:58.000000000 +0200
-@@ -8,6 +8,7 @@
- #include <stdarg.h>
- #include <stdio.h>
- #include <stddef.h>
-+#include <ctype.h>
- 
- void UArray_append_(UArray *self, const UArray *other)
- {
-diff -up Io-2007-10-10/libs/basekit/source/UArray.h~ Io-2007-10-10/libs/basekit/source/UArray.h
---- Io-2007-10-10/libs/basekit/source/UArray.h~	2008-03-30 21:43:37.000000000 +0200
-+++ Io-2007-10-10/libs/basekit/source/UArray.h	2008-03-30 21:43:37.000000000 +0200
+diff -up stevedekorte-io-6a5f734/libs/basekit/source/UArray.h.protos stevedekorte-io-6a5f734/libs/basekit/source/UArray.h
+--- stevedekorte-io-6a5f734/libs/basekit/source/UArray.h.protos	2008-03-30 06:16:50.000000000 +0200
++++ stevedekorte-io-6a5f734/libs/basekit/source/UArray.h	2010-01-15 12:30:18.000000000 +0100
 @@ -165,6 +165,8 @@ BASEKIT_API int UArray_isZero(const UArr
  
  BASEKIT_API int UArray_contains_(const UArray *self, const UArray *other);
@@ -32,7 +10,7 @@ diff -up Io-2007-10-10/libs/basekit/sour
  
  // find
  
-@@ -244,6 +246,10 @@ typedef int (UArraySortCallback)(const v
+@@ -248,6 +250,10 @@ typedef int (UArraySortCallback)(const v
  
  BASEKIT_API void UArray_sortBy_(UArray *self, UArraySortCallback *cmp);
  
@@ -43,14 +21,36 @@ diff -up Io-2007-10-10/libs/basekit/sour
  // accessing
  
  #define UARRAY_BYTEPOSAT_(self, n) (self->itemSize * n)
-diff -up Io-2007-10-10/libs/basekit/source/UArray_character.c~ Io-2007-10-10/libs/basekit/source/UArray_character.c
---- Io-2007-10-10/libs/basekit/source/UArray_character.c~	2008-03-30 21:33:06.000000000 +0200
-+++ Io-2007-10-10/libs/basekit/source/UArray_character.c	2008-03-30 21:33:06.000000000 +0200
+diff -up stevedekorte-io-6a5f734/libs/basekit/source/UArray_character.c.protos stevedekorte-io-6a5f734/libs/basekit/source/UArray_character.c
+--- stevedekorte-io-6a5f734/libs/basekit/source/UArray_character.c.protos	2008-03-30 06:16:50.000000000 +0200
++++ stevedekorte-io-6a5f734/libs/basekit/source/UArray_character.c	2010-01-15 12:30:43.000000000 +0100
 @@ -5,6 +5,7 @@
  
- #include "UArray.h" 
+ #include "UArray.h"
  #include <math.h>
 +#include <ctype.h>
  
  // set
  
+diff -up stevedekorte-io-6a5f734/libs/basekit/source/UArray_string.c.protos stevedekorte-io-6a5f734/libs/basekit/source/UArray_string.c
+--- stevedekorte-io-6a5f734/libs/basekit/source/UArray_string.c.protos	2008-03-30 06:16:50.000000000 +0200
++++ stevedekorte-io-6a5f734/libs/basekit/source/UArray_string.c	2010-01-15 12:30:18.000000000 +0100
+@@ -8,6 +8,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stddef.h>
++#include <ctype.h>
+ 
+ void UArray_append_(UArray *self, const UArray *other)
+ {
+diff -up stevedekorte-io-6a5f734/libs/iovm/source/IoMessage_opShuffle.c.protos stevedekorte-io-6a5f734/libs/iovm/source/IoMessage_opShuffle.c
+--- stevedekorte-io-6a5f734/libs/iovm/source/IoMessage_opShuffle.c.protos	2008-03-30 06:16:50.000000000 +0200
++++ stevedekorte-io-6a5f734/libs/iovm/source/IoMessage_opShuffle.c	2010-01-15 12:30:18.000000000 +0100
+@@ -4,6 +4,7 @@
+ #include "IoMessage_opShuffle.h"
+ #include "IoMap.h"
+ #include "IoNumber.h"
++#include <ctype.h>
+ 
+ #define DATA(self) ((IoMessageData *)IoObject_dataPointer(self))
+ 


Index: Io-language.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Io-language/devel/Io-language.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- Io-language.spec	15 Jan 2010 12:10:09 -0000	1.14
+++ Io-language.spec	15 Jan 2010 13:59:56 -0000	1.15
@@ -5,16 +5,17 @@
 #
 # Please submit bugfixes or comments to us at the above email addresses
 
-%define _version 2007-10-10
+%define _version 2008.03.30
  
 Name:           Io-language
-Version:        20071010
-Release:        12%{?dist}
+Version:        20080330
+Release:        1%{?dist}
 Summary:        Io is a small, prototype-based programming language
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://www.iolanguage.com/
-Source0:        http://io.urbanape.com/release/Io-%{_version}.tar.gz
+# To get this file do wget http://github.com/stevedekorte/io/tarball/%{_version}
+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
@@ -25,7 +26,7 @@ BuildRequires:  libsamplerate-devel libs
 BuildRequires:  libxml2-devel mysql-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
+BuildRequires:  libuuid-devel readline-devel
 
 %description
 Io is a small, prototype-based programming language. The ideas in
@@ -85,10 +86,10 @@ Io mysql bindings
 
 
 %prep
-%setup -q -n Io-%{_version}
+%setup -q -n stevedekorte-io-6a5f734
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
+%patch1 -p1 -b .gcc43
+%patch2 -p1 -b .protos
 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>
@@ -98,18 +99,19 @@ if [ -f /usr/include/io/IoVM.h ]; then
 fi
 # libstdc++.so is searched and not found ...
 sed -i -e 's|dependsOnLib("stdc++")||g' addons/SoundTouch/build.io
-# remove add-ons which we do not which to build ever
+# remove add-ons which we do not want to build ever
 rm -fr addons/AVCodec
 # for %doc
-rm docs/guide_files/.htmle
 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
+chmod -x addons/NullAddon/source/IoNullAddon.?
 
 
 %build
 make %{?_smp_mflags} INSTALL_PREFIX=%{_prefix} OPTIMIZE="$RPM_OPT_FLAGS" \
-  DLL_COMMAND='-shared -Wl,-soname="libiovmall.so.1"'
+  DLL_COMMAND='-shared -Wl,-soname="libiovmall.so.2"'
 
 
 %install
@@ -120,8 +122,8 @@ mkdir -p $RPM_BUILD_ROOT%{_libdir}/io/ad
 mkdir -p $RPM_BUILD_ROOT%{_includedir}
 install -m 755 _build/binaries/io $RPM_BUILD_ROOT%{_bindir}
 install -m 755 _build/dll/libiovmall.so \
-  $RPM_BUILD_ROOT%{_libdir}/libiovmall.so.0
-ln -s libiovmall.so.0 $RPM_BUILD_ROOT%{_libdir}/libiovmall.so
+  $RPM_BUILD_ROOT%{_libdir}/libiovmall.so.2
+ln -s libiovmall.so.2 $RPM_BUILD_ROOT%{_libdir}/libiovmall.so
 cp -a _build/headers $RPM_BUILD_ROOT%{_includedir}/io
 # install the addons
 for i in addons/*; do
@@ -151,7 +153,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc license.txt
 %{_bindir}/io
-%{_libdir}/libiovmall.so.0
+%{_libdir}/libiovmall.so.2
 %dir %{_libdir}/io
 %dir %{_libdir}/io/addons
 %{_libdir}/io/addons/AsyncRequest
@@ -162,16 +164,21 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/io/addons/CGI
 %{_libdir}/io/addons/ContinuedFraction
 %{_libdir}/io/addons/Curses
+%{_libdir}/io/addons/DistributedObjects
+%{_libdir}/io/addons/EditLine
 %{_libdir}/io/addons/Flux
 %{_libdir}/io/addons/Fnmatch
 %{_libdir}/io/addons/LZO
 %{_libdir}/io/addons/Libxml2
 %{_libdir}/io/addons/Loki
 %{_libdir}/io/addons/MD5
+%{_libdir}/io/addons/NetworkAdapter
 %{_libdir}/io/addons/NotificationCenter
+%{_libdir}/io/addons/NullAddon
 %{_libdir}/io/addons/Random
 %{_libdir}/io/addons/Range
 %{_libdir}/io/addons/Rational
+%{_libdir}/io/addons/ReadLine
 %{_libdir}/io/addons/Regex
 %{_libdir}/io/addons/SHA1
 %{_libdir}/io/addons/SQLite3
@@ -181,11 +188,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/io/addons/Thread
 %{_libdir}/io/addons/UUID
 %{_libdir}/io/addons/User
+%{_libdir}/io/addons/Volcano
 %{_libdir}/io/addons/Zlib
 
 %files devel
 %defattr(-,root,root,-)
-%doc docs/guide.html docs/guide.pdf docs/guide_files
+%doc docs/*
 %{_libdir}/libiovmall.so
 %{_includedir}/io
 
@@ -216,6 +224,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jan 15 2010 Hans de Goede <hdegoede at redhat.com> - 20080330-1
+- Rebase to latest upstream release 20080330
+- Bump soname because of ABI change
+- Fix FTBFS (#511617)
+
 * Fri Jan 15 2010 Caolán McNamara <caolanm at redhat.com> - 20071010-12
 - Resolves: rhbz#511617 FTBFS
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Io-language/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	11 Nov 2007 21:20:40 -0000	1.3
+++ sources	15 Jan 2010 13:59:56 -0000	1.4
@@ -1 +1 @@
-86f92c95c56f3066c7607f0ccf345716  Io-2007-10-10.tar.gz
+c0338aea770c836811b1be6a0d372373  Io-language-20080330.tar.gz

More information about the scm-commits mailing list