rpms/lordsawar/devel lordsawar-0.1.7-pre3-dso.patch, NONE, 1.1 lordsawar.spec, 1.14, 1.15

[Ian Weller]

Author: ianweller

Update of /cvs/pkgs/rpms/lordsawar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31006

Modified Files:
	lordsawar.spec 
Added Files:
	lordsawar-0.1.7-pre3-dso.patch 
Log Message:
forgot to add patch


lordsawar-0.1.7-pre3-dso.patch:
 Makefile.am        |    2 +-
 editor/Makefile.am |   10 +++++-----
 pbm/Makefile.am    |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE lordsawar-0.1.7-pre3-dso.patch ---
diff -up lordsawar-0.1.7-pre3/src/editor/Makefile.am.orig lordsawar-0.1.7-pre3/src/editor/Makefile.am
--- lordsawar-0.1.7-pre3/src/editor/Makefile.am.orig	2010-03-01 22:45:32.046812279 -0600
+++ lordsawar-0.1.7-pre3/src/editor/Makefile.am	2010-03-01 22:45:55.496703275 -0600
@@ -91,34 +91,34 @@ lordsawar_editor_LDADD = $(top_builddir)
                          $(top_builddir)/src/liblordsawargfx.la \
                          $(top_builddir)/src/liblordsawar.la \
                          $(GTKMM_LIBS) \
-                         $(SDL_LIBS) -ltar \
+                         $(SDL_LIBS) -ltar -lz \
                          @LIBINTL@ -L$(top_builddir)/src
 
 lordsawar_shield_editor_LDADD = $(top_builddir)/src/gui/liblwgui.la \
                          $(top_builddir)/src/liblordsawargfx.la \
                          $(top_builddir)/src/liblordsawar.la \
-                         $(SDL_LIBS) -ltar \
+                         $(SDL_LIBS) -ltar -lz \
                          $(GTKMM_LIBS) \
                          @LIBINTL@ -L$(top_builddir)/src
 
 lordsawar_city_editor_LDADD = $(top_builddir)/src/gui/liblwgui.la \
                          $(top_builddir)/src/liblordsawargfx.la \
                          $(top_builddir)/src/liblordsawar.la \
-                         $(SDL_LIBS) -ltar \
+                         $(SDL_LIBS) -ltar -lz \
                          $(GTKMM_LIBS) \
                          @LIBINTL@ -L$(top_builddir)/src
 
 lordsawar_army_editor_LDADD = $(top_builddir)/src/gui/liblwgui.la \
                          $(top_builddir)/src/liblordsawargfx.la \
                          $(top_builddir)/src/liblordsawar.la \
-                         $(SDL_LIBS) -ltar \
+                         $(SDL_LIBS) -ltar -lz \
                          $(GTKMM_LIBS) \
                          @LIBINTL@ -L$(top_builddir)/src
 
 lordsawar_tile_editor_LDADD = $(top_builddir)/src/gui/liblwgui.la \
                          $(top_builddir)/src/liblordsawargfx.la \
                          $(top_builddir)/src/liblordsawar.la \
-                         $(SDL_LIBS) -ltar \
+                         $(SDL_LIBS) -ltar -lz \
                          $(GTKMM_LIBS) \
                          @LIBINTL@ -L$(top_builddir)/src
 endif
diff -up lordsawar-0.1.7-pre3/src/Makefile.am.orig lordsawar-0.1.7-pre3/src/Makefile.am
--- lordsawar-0.1.7-pre3/src/Makefile.am.orig	2010-03-01 22:44:26.087812086 -0600
+++ lordsawar-0.1.7-pre3/src/Makefile.am	2010-03-01 22:45:01.230812450 -0600
@@ -136,7 +136,7 @@ lordsawar_LDADD = liblordsawar.la \
     $(SDLSOUND_LIBS) $(SDL_LIBS) \
     $(GTKMM_LIBS) \
     $(LIBGNET_LIBS) \
-    $(LIBSIGC_LIBS) -ltar \
+    $(LIBSIGC_LIBS) -ltar -lz \
     gui/liblwgui.la \
     @LIBINTL@
 
diff -up lordsawar-0.1.7-pre3/src/pbm/Makefile.am.orig lordsawar-0.1.7-pre3/src/pbm/Makefile.am
--- lordsawar-0.1.7-pre3/src/pbm/Makefile.am.orig	2010-03-01 22:45:11.777813930 -0600
+++ lordsawar-0.1.7-pre3/src/pbm/Makefile.am	2010-03-01 22:45:21.040781147 -0600
@@ -23,7 +23,7 @@ bin_PROGRAMS = lordsawar-pbm
 lordsawar_pbm_SOURCES =  pbm.cpp main.cpp pbm.h ${top_srcdir}/src/pbm-game-client.cpp ${top_srcdir}/src/pbm-game-client.h ${top_srcdir}/src/game-client-decoder.cpp ${top_srcdir}/src/game-client-decoder.h ${top_srcdir}/src/chat-client.cpp ${top_srcdir}/src/chat-client.h
 
 
-lordsawar_pbm_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar \
+lordsawar_pbm_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar -lz \
                          $(top_builddir)/src/liblordsawar.la \
 			-lz \
                          @LIBINTL@ \


Index: lordsawar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/devel/lordsawar.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- lordsawar.spec	2 Mar 2010 05:17:37 -0000	1.14
+++ lordsawar.spec	3 Mar 2010 02:44:50 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           lordsawar
 Version:        0.1.7
-Release:        0.2.pre3%{?dist}
+Release:        0.3.pre3%{?dist}
 Summary:        Turn-based strategy game in a fantasy setting
 
 # This is used for prereleases and such
@@ -68,6 +68,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Mar  2 2010 Ian Weller <ian at ianweller.org> - 0.1.7-0.3.pre3
+- Forgot to add the patch in CVS (whoops)
+
 * Mon Mar  1 2010 Ian Weller <ian at ianweller.org> - 0.1.7-0.2.pre3
 - Add lordsawar-0.1.7-pre3-dso.patch (patch from upstream)