rpms/lordsawar/devel .cvsignore, 1.5, 1.6 lordsawar.spec, 1.13, 1.14 sources, 1.5, 1.6 lordsawar-0.1.6-DSO-fix.patch, 1.1, NONE

[Ian Weller]

Author: ianweller

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

Modified Files:
	.cvsignore lordsawar.spec sources 
Removed Files:
	lordsawar-0.1.6-DSO-fix.patch 
Log Message:
Sync with F-13 branch, which just built successfully (yay)



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- .cvsignore	7 Nov 2009 00:25:28 -0000	1.5
+++ .cvsignore	2 Mar 2010 05:17:36 -0000	1.6
@@ -1 +1 @@
-lordsawar-0.1.6.tar.gz
+lordsawar-0.1.7-pre3.tar.gz


Index: lordsawar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/devel/lordsawar.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- lordsawar.spec	13 Feb 2010 17:53:10 -0000	1.13
+++ lordsawar.spec	2 Mar 2010 05:17:37 -0000	1.14
@@ -1,29 +1,35 @@
 Name:           lordsawar
-Version:        0.1.6
-Release:        4%{?dist}
+Version:        0.1.7
+Release:        0.2.pre3%{?dist}
 Summary:        Turn-based strategy game in a fantasy setting
 
+# This is used for prereleases and such
+# If not prerelease, set this to %{version}
+%global	rel_version	0.1.7-pre3
+
 Group:          Amusements/Games
 License:        GPLv2+
 URL:            http://savannah.nongnu.org/projects/%{name}
-Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.gz
-Patch0:         lordsawar-0.1.6-DSO-fix.patch
+Source0:        http://download.savannah.gnu.org/releases/%{name}/%{name}-%{rel_version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libglademm24-devel gtkmm24-devel gnet2-devel gettext desktop-file-utils
 BuildRequires:  SDL-devel SDL_image-devel SDL_mixer-devel expat-devel libsigc++20-devel
 BuildRequires:  boost-devel libuuid-devel libtiff-devel libvorbis-devel
-BuildRequires:  libjpeg-devel
+BuildRequires:  libjpeg-devel libtar-devel
 BuildRequires:  intltool >= 0.35.0
 
+# This patch is directly from upstream
+Patch0:         lordsawar-0.1.7-pre3-dso.patch
+
 %description
 LordsAWar! is a turn-based strategy game set in a fantasy setting.
 
 
 %prep
-%setup -q
-sed -i.orig -e "s/Comment=Play a clone of Warlords II/Comment=Play a turn-based strategy game/" dat/lordsawar.desktop
+%setup -qn %{name}-%{rel_version}
 %patch0 -p1
+sed -i.orig -e "s/Comment=Play a clone of Warlords II/Comment=Play a turn-based strategy game/" dat/lordsawar.desktop
 
 
 %build
@@ -51,6 +57,8 @@ rm -rf %{buildroot}
 %{_bindir}/%{name}
 %{_bindir}/%{name}-army-editor
 %{_bindir}/%{name}-editor
+%{_bindir}/%{name}-city-editor
+%{_bindir}/%{name}-shield-editor
 %{_bindir}/%{name}-tile-editor
 %{_bindir}/%{name}-pbm
 %{_datadir}/gnome/help/%{name}
@@ -60,8 +68,11 @@ rm -rf %{buildroot}
 
 
 %changelog
-* Fri Feb 13 2010 Ian Weller <ian at ianweller.org> - 0.1.6-4
-- Patch: lordsawar-0.1.6-DSO-fix.patch (BZ 564950)
+* 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)
+
+* Sun Feb 28 2010 Ian Weller <ian at ianweller.org> - 0.1.7-0.1.pre3
+- 0.1.7-pre3
 
 * Fri Feb 12 2010 Ian Weller <ian at ianweller.org> - 0.1.6-3
 - Remove BuildRequires: e2fsprogs-devel from libuuid-devel switch


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lordsawar/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	7 Nov 2009 00:25:28 -0000	1.5
+++ sources	2 Mar 2010 05:17:37 -0000	1.6
@@ -1 +1 @@
-421955b07fdb9f7ed2d1b301701825f4  lordsawar-0.1.6.tar.gz
+eadcf01384da54840c487f2d7390d848  lordsawar-0.1.7-pre3.tar.gz


--- lordsawar-0.1.6-DSO-fix.patch DELETED ---