rpms/tolua++/devel tolua++.spec,1.2,1.3

[Ian Chapman (oddsocks)]

Author: oddsocks

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

Modified Files:
	tolua++.spec 
Log Message:
auto-import tolua++-1.0.92-4 on branch devel from tolua++-1.0.92-4.src.rpm


Index: tolua++.spec
===================================================================
RCS file: /cvs/extras/rpms/tolua++/devel/tolua++.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tolua++.spec	4 Jun 2006 13:58:32 -0000	1.2
+++ tolua++.spec	28 Aug 2006 16:43:33 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           tolua++
 Version:        1.0.92
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A tool to integrate C/C++ code with Lua
 
 Group:          Development/Tools
@@ -11,7 +11,6 @@
 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
 
@@ -32,13 +31,13 @@
 %prep
 %setup -q
 %patch0 -p1
-sed -i 's/\r//' doc/tolua++.html
+sed -i 's/\r//' doc/%{name}.html
 
 
 %build
 scons %{?_smp_mflags} -Q CCFLAGS="$RPM_OPT_FLAGS  -I%{_includedir}" tolua_lib=%{solib} LINKFLAGS="-Wl,-soname,lib%{solib}.so"
 #Recompile the exe without the soname. An ugly hack.
-gcc -o bin/tolua++ src/bin/tolua.o src/bin/toluabind.o -Llib -l%{solib} -llua -ldl -lm
+gcc -o bin/%{name} src/bin/tolua.o src/bin/toluabind.o -Llib -l%{solib} -llua -ldl -lm
 
 
 %install
@@ -46,9 +45,9 @@
 mkdir -p %{buildroot}%{_bindir}
 mkdir %{buildroot}%{_libdir}
 mkdir %{buildroot}%{_includedir}
-install -m0755 bin/tolua++  %{buildroot}%{_bindir}
+install -m0755 bin/%{name}  %{buildroot}%{_bindir}
 install -m0755 lib/lib%{solib}.so %{buildroot}%{_libdir}
-install -m0644 include/tolua++.h %{buildroot}%{_includedir}
+install -m0644 include/%{name}.h %{buildroot}%{_includedir}
 cd %{buildroot}%{_libdir}
 ln -s lib%{solib}.so libtolua++.so
 
@@ -66,14 +65,18 @@
 %{_libdir}/lib%{solib}.so
 %doc README doc/*
 
+
 %files devel
 %defattr(-,root,root,-)
-%{_bindir}/tolua++
+%{_bindir}/%{name}
 %{_libdir}/libtolua++.so
-%{_includedir}/tolua++.h
+%{_includedir}/%{name}.h
 
 
 %changelog
+* Mon Aug 28 2006 Ian Chapman <packages at amiga-hardware.com> 1.0.92-4%{?dist}
+- Release bump for FC6 mass rebuild
+
 * Sat Jun 03 2006 Ian Chapman <packages at amiga-hardware.com> 1.0.92-3%{?dist}
 - Fixed issue with where tolua++ was tagged with an soname the same as the lib
   meaning ld would fail to locate the library.
@@ -85,4 +88,4 @@
 - Now adds soname to library
 
 * Fri Jun 02 2006 Ian Chapman <packages at amiga-hardware.com> 1.0.92-1
-- Initial Release
\ No newline at end of file
+- Initial Release