[blobby] Unbundle tinyxml and lua

[Ankur Sinha]

commit 576a9f5d6c0e7fdb33585d3908aef24aa94cd7de
Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur at gmail.com>
Date:   Tue Sep 16 15:26:20 2014 +1000

    Unbundle tinyxml and lua
    
    raknet is still bundled. I see that it has now been released under the
    BSD license. I'll unbundle it when I have the time to package raknet
    too.

 blobby.spec |   21 ++++++++++++++++++++-
 1 files changed, 20 insertions(+), 1 deletions(-)
---
diff --git a/blobby.spec b/blobby.spec
index 476bf54..649f18d 100644
--- a/blobby.spec
+++ b/blobby.spec
@@ -1,7 +1,7 @@
 %global svn_rev 1541
 Name:           blobby
 Version:        1.0
-Release:        1svn%{svn_rev}%{?dist}
+Release:        2svn%{svn_rev}%{?dist}
 Summary:        Volley-ball game
 Group:          Amusements/Games
 License:        GPLv2+
@@ -16,6 +16,7 @@ Source2:        blobby.appdata.xml
 
 BuildRequires:  SDL2-devel, physfs-devel, zlib-devel, cmake, boost-devel, zip
 BuildRequires:  ImageMagick, desktop-file-utils, hicolor-icon-theme
+BuildRequires:  tinyxml-devel lua-devel
 BuildRequires:  pkgconfig
 
 %description
@@ -25,6 +26,20 @@ Blobby Volley 2 is the continuation of this lovely game.
 %prep
 %setup -q -n %{name}-%{version}svn%{svn_rev}
 
+# Remove lua and tinyxml
+rm -rvf src/lua
+rm -rvf src/tinyxml
+sed -ibackup -e "/add_subdirectory(lua)/d" -e "/add_subdirectory(tinyxml)/d" src/CMakeLists.txt
+sed -ibackup 's|tinyxml/||' src/UserConfig.cpp
+sed -ibackup 's|tinyxml/||' src/TextManager.cpp
+sed -ibackup 's|tinyxml/||' src/state/NetworkSearchState.cpp
+sed -ibackup 's|tinyxml/||' src/ReplayRecorder.cpp
+sed -ibackup 's|tinyxml/||' src/FileRead.cpp
+sed -ibackup 's|lua/||' src/FileRead.cpp
+sed -ibackup 's|lua/||' src/GameLogic.cpp
+sed -ibackup 's|lua/||' src/IScriptableComponent.cpp
+sed -ibackup 's|lua/||' src/ScriptedInputSource.cpp
+
 # Updated to SDL2 but still looks for SDL also? Why!
 sed -ibackup '/find_package(SDL REQUIRED)/d' src/CMakeLists.txt
 
@@ -66,6 +81,10 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{_datadir}/appdata/%{name}.appdata.xml
 
 %changelog
+* Tue Sep 16 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.0-2svn1541
+- Unbundle tinyxml and lua
+- rhbz 1076850, 1036522
+
 * Tue Sep 16 2014 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 1.0-1svn1541
 - Update to lastest available code