rpms/tolua++/devel tolua++-1.0.92-makeso.patch, NONE, 1.1 tolua++.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

[Ian Chapman (oddsocks)]

Author: oddsocks

Update of /cvs/extras/rpms/tolua++/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31217/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tolua++-1.0.92-makeso.patch tolua++.spec 
Log Message:
auto-import tolua++-1.0.92-2 on branch devel from tolua++-1.0.92-2.src.rpm

tolua++-1.0.92-makeso.patch:

--- NEW FILE tolua++-1.0.92-makeso.patch ---
--- tolua++-1.0.92/SConstruct.orig	2006-04-10 10:45:44.000000000 +0100
+++ tolua++-1.0.92/SConstruct	2006-06-02 15:12:34.000000000 +0100
@@ -22,7 +22,7 @@
 opts.Add('LIBPATH', 'library path', [])
 
 opts.Add('tolua_bin', 'the resulting binary', 'tolua++')
-opts.Add('tolua_lib', 'the resulting library', 'tolua++')
+opts.Add('tolua_lib', 'the resulting library', 'tolua++-5.1')
 opts.Add('TOLUAPP', 'the name of the tolua++ binary (to use with built_dev=1)', 'tolua++')
 
 opts.Add('prefix', 'The installation prefix')
--- tolua++-1.0.92/config_linux.py.orig	2005-04-30 03:20:38.000000000 +0100
+++ tolua++-1.0.92/config_linux.py	2006-06-02 15:09:03.000000000 +0100
@@ -15,8 +15,8 @@
 #
 # You can see more 'generic' options for POSIX systems on config_posix.py
 
-prefix = '/usr/local'
+prefix = '/usr'
 
 # libraries (based on Debian's installation of lua)
-LIBS = ['lua50', 'lualib50', 'dl', 'm']
+LIBS = ['lua', 'dl', 'm']
 
--- tolua++-1.0.92/custom-5.1.py.orig	2006-02-13 23:57:26.000000000 +0000
+++ tolua++-1.0.92/custom-5.1.py	2006-06-02 15:10:08.000000000 +0100
@@ -1,11 +1,11 @@
 CC = 'gcc'
 CCFLAGS = ['-I/usr/include/lua5.1', '-O2', '-ansi']
 #LIBPATH = ['/usr/local/lib']
-LIBS = ['lua5.1', 'dl', 'm']
-prefix = '/usr/local'
+LIBS = ['lua', 'dl', 'm']
+prefix = '/usr'
 build_dev = 1
-ENV = {'PATH': '/usr/local/bin:/bin:/usr/bin'}
-tolua_bin = 'tolua++5.1'
-tolua_lib = 'tolua++5.1'
+ENV = {'PATH': '/bin:/usr/bin:/usr/local/bin'}
+tolua_bin = 'tolua++'
+tolua_lib = 'tolua++-5.1'
 TOLUAPP = 'tolua++5.1'
 
--- tolua++-1.0.92/src/lib/SCsub.orig	2005-11-28 13:51:15.000000000 +0000
+++ tolua++-1.0.92/src/lib/SCsub	2006-06-02 15:11:17.000000000 +0100
@@ -9,5 +9,4 @@
 	'tolua_to.c',
 	]
 
-env.lib_target = env.Library('#/lib/'+env['tolua_lib'], sources)
-
+env.lib_target = env.SharedLibrary('#/lib/'+env['tolua_lib'], sources)


--- NEW FILE tolua++.spec ---
%define         solib tolua++-5.1

Name:           tolua++
Version:        1.0.92
Release:        2%{?dist}
Summary:        A tool to integrate C/C++ code with Lua

Group:          Development/Tools
License:        Freeware
URL:            http://www.codenix.com/~tolua/
Source0:        http://www.codenix.com/~tolua/%{name}-%{version}.tar.bz2
Patch0:         tolua++-1.0.92-makeso.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  scons
BuildRequires:  lua-devel >= 5.1

%description
tolua++ is an extended version of tolua, a tool to integrate C/C++ code with
Lua. tolua++ includes new features oriented to C++

%package devel
Summary:        Development files for tolua++
Group:          Development/Libraries
Requires:       tolua++ = %{version}-%{release}
Requires:       lua-devel >= 5.1

%description devel
Development files for tolua++


%prep
%setup -q
%patch0 -p1
sed -i 's/\r//' doc/tolua++.html


%build
scons %{?_smp_mflags} -Q CCFLAGS="$RPM_OPT_FLAGS  -I%{_includedir}" tolua_lib=%{solib} LINKFLAGS="-Wl,-soname,lib%{solib}.so"


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_bindir}
mkdir %{buildroot}%{_libdir}
mkdir %{buildroot}%{_includedir}
install -m0755 bin/tolua++  %{buildroot}%{_bindir}
install -m0755 lib/lib%{solib}.so %{buildroot}%{_libdir}
install -m0644 include/tolua++.h %{buildroot}%{_includedir}
cd %{buildroot}%{_libdir}
ln -s lib%{solib}.so libtolua++.so


%clean
rm -rf %{buildroot}


%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_libdir}/lib%{solib}.so
%doc README doc/*

%files devel
%defattr(-,root,root,-)
%{_bindir}/tolua++
%{_libdir}/libtolua++.so
%{_includedir}/tolua++.h


%changelog
* Fri Jun 02 2006 Ian Chapman <packages at amiga-hardware.com> 1.0.92-2%{?dist}
- Changed license from Freeware Style to just Freeware
- Changed => to more conventional >= for (build)requires
- Moved %%{_bindir}/tolua++ to devel package
- Now adds soname to library

* Fri Jun 02 2006 Ian Chapman <packages at amiga-hardware.com> 1.0.92-1
- Initial Release

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tolua++/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Jun 2006 13:48:08 -0000	1.1
+++ .cvsignore	3 Jun 2006 13:48:45 -0000	1.2
@@ -0,0 +1 @@
+tolua++-1.0.92.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tolua++/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Jun 2006 13:48:08 -0000	1.1
+++ sources	3 Jun 2006 13:48:45 -0000	1.2
@@ -0,0 +1 @@
+f4682e065b7d6d4de5eec13e6b7d347c  tolua++-1.0.92.tar.bz2