Packman Build Service PMBS

Changes of Revision 2

zod.spec Changed

@@ -16,16 +16,14 @@
 #
 
 
-%global         tar_version 2011-09-06
-%global         _version %%(sed 's@-@@g' <<< %{tar_version})
 Name:           zod
-Version:        %{_version}
+Version:        20110906
 Release:        0
 Summary:        An Open Source Remake of the 1996 Game Z by Bitmap Brothers
 License:        GPL-3.0
 Group:          Amusements/Games/Strategy/Real Time
 Url:            http://zod.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/zod/linux_releases/zod_linux-%{tar_version}.tar.gz
+Source0:        http://downloads.sourceforge.net/zod/linux_releases/zod_linux-2011-09-06.tar.gz
 Source1:        zod.desktop
 Patch0:         https://raw.githubusercontent.com/hasufell/hasufell-repository/master/packages/games-strategy/zod-engine/files/zod-engine-20110906-proper-linux-support.patch
 Patch1:         https://raw.githubusercontent.com/hasufell/hasufell-repository/master/packages/games-strategy/zod-engine/files/zod-engine-20110906-build.patch
@@ -68,6 +66,7 @@
 %patch0 -p1
 %patch1 -p1
 
+%build
 rm -r assets/planets_1-10-10
 rm -r assets/buildings/fort_old
 rm -r assets/sounds/radar_sound-old1.wav
@@ -75,7 +74,6 @@
 find assets -type f -name 'Thumbs.db' | xargs rm
 find . -type f -name '*.txt' | xargs dos2unix
 
-%build
 pushd zod_src
 sed -i '/LDFLAGS=/ s@$@ -L%{_libdir}/mysql@' makefile
 make %{?_smp_mflags} DATA_PATH=%{_datadir}/%{name} main map_editor

zod-engine-20110906-build.patch Changed

@@ -5,8 +5,43 @@
 
 respect CXX and CXXFLAGS
 
---- zod_engine/zod_src/makefile
-+++ zod_engine/zod_src/makefile
+--- a/zod_launcher_src/common.cpp
++++ b/zod_launcher_src/common.cpp
+@@ -20,6 +20,7 @@
+ #define OSPATH_SEP '/'
+ 
+ #endif
++#include <ctime>
+ 
+ namespace COMMON
+ {
+--- a/zod_launcher_src/makefile
++++ b/zod_launcher_src/makefile
+@@ -1,2 +1,11 @@
++CXX ?= g++
++CXXFLAGS += $(shell wx-config --cppflags)
++LIBS += $(shell wx-config --libs)
++EXENAME = zod_launcher
++
++ifdef DATA_PATH
++	CXXFLAGS += -DDATA_PATH=\"$(DATA_PATH)\"
++endif
++
+ default:
+-	g++ -g -o zod_launcher *.cpp `wx-config --cppflags` `wx-config --libs`
++	$(CXX) $(CXXFLAGS) -o $(EXENAME) *.cpp  $(LDFLAGS) $(LIBS)
+--- a/zod_src/common.cpp
++++ b/zod_src/common.cpp
+@@ -24,6 +24,7 @@
+ #define OSPATH_SEP '/'
+ 
+ #endif
++#include <ctime>
+ 
+ namespace COMMON
+ {
+--- a/zod_src/makefile
++++ b/zod_src/makefile
 @@ -1,6 +1,6 @@
 -CC=g++
 -CFLAGS=-c -g `sdl-config --cflags` -D DISABLE_OPENGL -D DISABLE_REGCHECK
@@ -17,7 +52,7 @@
  INCLUDES=
  BASEFILES = common.cpp zsdl.cpp event_handler.cpp socket_handler.cpp server_socket.cpp client_socket.cpp zhud.cpp zfont_engine.cpp zfont.cpp zmini_map.cpp cursor.cpp zgui_window.cpp zbuildlist.cpp zsound_engine.cpp zmusic_engine.cpp zcomp_message_engine.cpp zpath_finding.cpp zpath_finding_astar.cpp zsettings.cpp zsdl_opengl.cpp zportrait.cpp zteam.cpp ztray.cpp zmysql.cpp zpsettings.cpp ztime.cpp zvote.cpp zunitrating.cpp zencrypt_aes.cpp zolists.cpp zgui_main_menu_base.cpp zgui_main_menu_widget.cpp
  COREFILES = zcore.cpp zserver.cpp zserver_events.cpp zserver_commands.cpp zclient.cpp zplayer.cpp zplayer_events.cpp zbot.cpp zbot_events.cpp SDL_rotozoom.cpp
-@@ -18,423 +18,426 @@
+@@ -18,423 +18,426 @@ MAPEDITOR_NAME = zod_map_editor
  MAPEDITOR_OFILES = map_editor.o $(CPPFILES:.cpp=.o)
  DATE = `date +%m-%d-%y`
  
@@ -577,18 +612,3 @@
  	
  zip:
  	zip zod_src_${DATE}.zip *.cpp *.h makefile
---- zod_engine/zod_launcher_src/makefile
-+++ zod_engine/zod_launcher_src/makefile
-@@ -1,2 +1,11 @@
-+CXX ?= g++
-+CXXFLAGS += `wx-config --cppflags`
-+LIBS += `wx-config --libs`
-+EXENAME = zod_launcher
-+
-+ifdef DATA_PATH
-+	CXXFLAGS += -DDATA_PATH=\"$(DATA_PATH)\"
-+endif
-+
- default:
--	g++ -g -o zod_launcher *.cpp `wx-config --cppflags` `wx-config --libs`
-+	$(CXX) $(CXXFLAGS) -o $(EXENAME) *.cpp  $(LDFLAGS) $(LIBS)