rpms/btanks/F-10 btanks-0.8-rename-lib.patch, NONE, 1.1 btanks.spec, 1.1, 1.2

[Alexey Torkhov]

Author: atorkhov

Update of /cvs/pkgs/rpms/btanks/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17074

Modified Files:
	btanks.spec 
Added Files:
	btanks-0.8-rename-lib.patch 
Log Message:
* Fri Apr 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-9
- Rename libbt.so to libbtanks.so because of conflict with blackbox


btanks-0.8-rename-lib.patch:

--- NEW FILE btanks-0.8-rename-lib.patch ---
diff -urp btanks-0.8.7686.orig/editor/SConscript btanks-0.8.7686/editor/SConscript
--- btanks-0.8.7686.orig/editor/SConscript	2009-04-03 19:49:23.000000000 +0400
+++ btanks-0.8.7686/editor/SConscript	2009-04-03 20:06:43.000000000 +0400
@@ -6,7 +6,7 @@ Import('sdl_libs')
 
 env = env.Clone()
 
-libs = ['bt', 'sdlx', 'mrt', 'SDL']
+libs = ['btanks', 'sdlx', 'mrt', 'SDL']
 
 ed_src = [
 	'base_brush.cpp', 
+++ btanks-0.8.7686/engine/SConscript	2009-04-03 20:06:43.000000000 +0400
@@ -109,7 +109,7 @@ if sys.platform != 'win32':
 	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/clunk'])
 
 
-bt = env.SharedLibrary('bt', bt_sources, LIBS=bt_libs)
+bt = env.SharedLibrary('btanks', bt_sources, LIBS=bt_libs)
 
 if sys.platform != 'win32' and len(env['prefix']) > 0:
 	Import('install_targets')
@@ -119,7 +119,7 @@ else:
 	Install('#', bt[0])
 
 bt_main_sources = ['src/main.cpp']
-bt_main_libs =  ['mrt', 'bt', 'SDL', 'sdlx']
+bt_main_libs =  ['mrt', 'btanks', 'SDL', 'sdlx']
 
 if sys.platform == "win32":
 	bt_rc = env.RES('src/bt.rc')
diff -urp btanks-0.8.7686.orig/objects/SConscript btanks-0.8.7686/objects/SConscript
--- btanks-0.8.7686.orig/objects/SConscript	2009-04-03 19:49:23.000000000 +0400
+++ btanks-0.8.7686/objects/SConscript	2009-04-03 20:08:58.000000000 +0400
@@ -7,7 +7,7 @@ Import('lib_dir')
 env = env.Clone()
 buildmode = env['mode']
 
-libs = ['bt', 'sdlx', 'mrt']
+libs = ['btanks', 'sdlx', 'mrt']
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/engine'])
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/mrt'])
 env.Prepend(LIBPATH=['#/build/' + buildmode + '/sdlx'])


Index: btanks.spec
===================================================================
RCS file: /cvs/pkgs/rpms/btanks/F-10/btanks.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- btanks.spec	18 Mar 2009 08:48:17 -0000	1.1
+++ btanks.spec	3 Apr 2009 17:19:38 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           btanks
 Version:        0.8.7686
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Funny battle on your desk
 Summary(ru):    Веселая маленькая война на столе
 
@@ -12,6 +12,9 @@
 Patch0:         %{name}-0.8-remove-rpath.patch
 # Disable video previews of map levels (we don't distribute video anyway)
 Patch1:         %{name}-0.8-disable-smpeg.patch
+# Rename libbt.so to libbtanks.so because of conflict with blackbox
+# http://sourceforge.net/tracker/?func=detail&atid=843095&aid=2722914&group_id=167474
+Patch2:         %{name}-0.8-rename-lib.patch
 Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        %{name}.desktop
 Source2:        bted.desktop
@@ -59,6 +62,7 @@
 %setup -q
 %patch0 -p1 -b .remove-rpath
 %patch1 -p1 -b .disable-smpeg
+%patch2 -p1 -b .rename-lib
 dos2unix -k *.txt ChangeLog *.url LICENSE EXCEPTION
 
 iconv -f latin1 -t utf-8 EXCEPTION > EXCEPTION.new
@@ -96,7 +100,7 @@
 
 # libs
 install -dm 755 %{buildroot}%{_libdir}/%{name}
-install -m 755 build/release/engine/libbt.so %{buildroot}%{_libdir}
+install -m 755 build/release/engine/libbtanks.so %{buildroot}%{_libdir}
 install -m 755 build/release/mrt/libmrt.so %{buildroot}%{_libdir}
 install -m 755 build/release/sdlx/libsdlx.so %{buildroot}%{_libdir}
 install -m 755 build/release/clunk/libclunk.so %{buildroot}%{_libdir}
@@ -152,6 +156,9 @@
 
 
 %changelog
+* Fri Apr 03 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-9
+- Rename libbt.so to libbtanks.so because of conflict with blackbox
+
 * Wed Mar 18 2009 Alexey Torkhov <atorkhov at gmail.com> - 0.8.7686-8
 - Package data as separate files instead of big zip blob