rpms/tolua++/F-12 tolua++-1.0.93-lua51.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 tolua++.spec, 1.8, 1.9 tolua++-1.0.92-gcc43.patch, 1.1, NONE tolua++-1.0.92-makeso.patch, 1.1, NONE

[Tim Niemueller]

Author: timn

Update of /cvs/pkgs/rpms/tolua++/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2053

Modified Files:
	.cvsignore sources tolua++.spec 
Added Files:
	tolua++-1.0.93-lua51.patch 
Removed Files:
	tolua++-1.0.92-gcc43.patch tolua++-1.0.92-makeso.patch 
Log Message:
Upgrade to latest stable release 1.0.93

tolua++-1.0.93-lua51.patch:
 config_linux.py |    4 ++--
 custom.py       |    9 +++++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

--- NEW FILE tolua++-1.0.93-lua51.patch ---
diff -urN tolua++-1.0.93/config_linux.py tolua++-1.0.93.lua51/config_linux.py
--- tolua++-1.0.93/config_linux.py	2005-11-30 23:31:27.000000000 +0100
+++ tolua++-1.0.93.lua51/config_linux.py	2010-02-25 14:35:06.000000000 +0100
@@ -4,7 +4,7 @@
 
 # Compiler flags (based on Debian's installation of lua)
 #LINKFLAGS = ['-g']
-CCFLAGS = ['-I/usr/include/lua50', '-O2', '-ansi', '-Wall']
+CCFLAGS = ['-O2', '-ansi', '-Wall']
 #CCFLAGS = ['-I/usr/include/lua50', '-g']
 
 # this is the default directory for installation. Files will be installed on
@@ -18,5 +18,5 @@
 prefix = '/usr/local'
 
 # libraries (based on Debian's installation of lua)
-LIBS = ['lua50', 'lualib50', 'dl', 'm']
+LIBS = ['lua', 'dl', 'm']
 
diff -urN tolua++-1.0.93/custom.py tolua++-1.0.93.lua51/custom.py
--- tolua++-1.0.93/custom.py	1970-01-01 01:00:00.000000000 +0100
+++ tolua++-1.0.93.lua51/custom.py	2010-02-25 14:44:50.000000000 +0100
@@ -0,0 +1,9 @@
+CCFLAGS = ['-O2', '-ansi']
+#LIBPATH = ['/usr/local/lib']
+LIBS = ['lua', 'dl', 'm']
+prefix = '/usr'
+build_dev=1
+tolua_bin = 'tolua++'
+tolua_lib = 'tolua++-5.1'
+TOLUAPP = 'tolua++-5.1'
+


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/tolua++/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	3 Jun 2006 13:48:45 -0000	1.2
+++ .cvsignore	27 Feb 2010 20:48:26 -0000	1.3
@@ -1 +1 @@
-tolua++-1.0.92.tar.bz2
+tolua++-1.0.93.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/tolua++/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	3 Jun 2006 13:48:45 -0000	1.2
+++ sources	27 Feb 2010 20:48:26 -0000	1.3
@@ -1 +1 @@
-f4682e065b7d6d4de5eec13e6b7d347c  tolua++-1.0.92.tar.bz2
+100aa6907b8108582080b37d79c0afd7  tolua++-1.0.93.tar.bz2


Index: tolua++.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tolua++/F-12/tolua++.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- tolua++.spec	27 Jul 2009 06:04:39 -0000	1.8
+++ tolua++.spec	27 Feb 2010 20:48:26 -0000	1.9
@@ -1,15 +1,14 @@
 %define         solib tolua++-5.1
 
 Name:           tolua++
-Version:        1.0.92
-Release:        9%{?dist}
+Version:        1.0.93
+Release:        1%{?dist}
 Summary:        A tool to integrate C/C++ code with Lua
 Group:          Development/Tools
 License:        Freely redistributable without restriction
 URL:            http://www.codenix.com/~tolua/
 Source0:        http://www.codenix.com/~tolua/%{name}-%{version}.tar.bz2
-Patch0:         tolua++-1.0.92-makeso.patch
-Patch1:         tolua++-1.0.92-gcc43.patch
+Patch0:         tolua++-1.0.93-lua51.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  scons
 BuildRequires:  lua-devel >= 5.1
@@ -31,13 +30,12 @@ Development files for tolua++
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
+%patch0 -p1 -b .lua51
 sed -i 's/\r//' doc/%{name}.html
 
 
 %build
-scons %{?_smp_mflags} -Q CCFLAGS="%{optflags}  -I%{_includedir}" tolua_lib=%{solib} LINKFLAGS="-Wl,-soname,lib%{solib}.so"
+scons %{?_smp_mflags} -Q CCFLAGS="%{optflags}  -I%{_includedir}" tolua_lib=%{solib} LINKFLAGS="-Wl,-soname,lib%{solib}.so" shared=1
 #Recompile the exe without the soname. An ugly hack.
 gcc -o bin/%{name} src/bin/tolua.o src/bin/toluabind.o -Llib -l%{solib} -llua -ldl -lm
 
@@ -76,6 +74,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Thu Feb 25 2010 Tim Niemueller <tim at niemueller.de> - 1.0.93-1
+- Upgrade to 1.0.93
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.92-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- tolua++-1.0.92-gcc43.patch DELETED ---


--- tolua++-1.0.92-makeso.patch DELETED ---