rpms/wesnoth/EL-6 sources,1.41,1.42 wesnoth.spec,1.83,1.84

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17482

Modified Files:
	sources wesnoth.spec 
Log Message:
Version bump.



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/EL-6/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	6 Sep 2009 22:53:55 -0000	1.41
+++ sources	8 Jul 2010 13:56:52 -0000	1.42
@@ -1 +1 @@
-493826bbd9ba355930765a7e8fe3749a  wesnoth-1.6.5.tar.bz2
+62ba3a4938d3e722797cfbe9450d3e36  wesnoth-1.8.3.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/EL-6/wesnoth.spec,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- wesnoth.spec	6 Sep 2009 22:53:55 -0000	1.83
+++ wesnoth.spec	8 Jul 2010 13:56:52 -0000	1.84
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.6.5
+Version:        1.8.3
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -11,22 +11,23 @@ Source1:        wesnothd.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-1.2.8-gcc43.patch
 Patch1:         wesnoth-1.5.11-remove-ogg-test.patch
-Patch2:		wesnoth-1.6.4-fribidi.patch
+#Patch2:        wesnoth-1.6.4-fribidi.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       wesnoth-data = %{version}
-BuildRequires:	SDL_image-devel
-BuildRequires:	SDL_mixer-devel
+BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_net-devel
-BuildRequires:	SDL_ttf-devel
-BuildRequires:	freetype-devel
+BuildRequires:  SDL_ttf-devel
+BuildRequires:  freetype-devel
 BuildRequires:  libpng-devel
-BuildRequires:	fribidi-devel
-BuildRequires:	python-devel
+BuildRequires:  fribidi-devel
+BuildRequires:  python-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:	gettext
-BuildRequires:	boost-devel
-BuildRequires:	pango-devel
+BuildRequires:  gettext
+BuildRequires:  boost-devel
+BuildRequires:  pango-devel
+BuildRequires:  lua-devel
 # Drop these when ogg test patch is removed.
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -50,12 +51,12 @@ friends--or strangers--and fight multi-p
 
 ##%ifnarch noarch
 %package server
-Summary:	%{summary}
-Group:		Amusements/Games
-Requires:	%{name} = %{version}-%{release}
+Summary:        %{summary}
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(preun):/sbin/chkconfig
-Requires(pre):	/usr/sbin/useradd
+Requires(pre):  /usr/sbin/useradd
 
 
 %description server
@@ -64,9 +65,9 @@ for multi-player games.
 
 
 %package tools
-Summary:	%{summary}
-Group:		Amusements/Games
-Requires:	%{name} = %{version}-%{release}
+Summary:        %{summary}
+Group:          Amusements/Games
+Requires:       %{name} = %{version}-%{release}
 
 
 %description tools
@@ -74,10 +75,10 @@ This package contains the game editor an
 
 ##%else
 %package data
-Summary:	%{summary}
-Group:		Amusements/Games
-Requires:	%{name} = %{version}
-BuildArch:	noarch
+Summary:        %{summary}
+Group:          Amusements/Games
+Requires:       %{name} = %{version}
+BuildArch:      noarch
 
 %description data
 This package contains the data files for Wesnoth.
@@ -87,8 +88,8 @@ This package contains the data files for
 %setup -qn wesnoth-%{version}
 %patch0 -p1 -b .gcc43
 %patch1 -p0
-%patch2 -p0
-autoreconf
+#%patch2 -p0
+autoreconf -i
 
 
 %build
@@ -120,7 +121,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/applic
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
-		     --remove-key="Version" \
+                     --remove-key="Version" \
                      icons/%{name}.desktop
 
 # add icon for menus
@@ -146,7 +147,7 @@ make install-exec DESTDIR=${RPM_BUILD_RO
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
-		     --remove-key="Version" \
+                     --remove-key="Version" \
                      icons/%{name}_editor.desktop
 
 # arrange server package files
@@ -194,7 +195,7 @@ fi
 #%ifnarch noarch
 %pre server
 /usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
-	-r -d /var/run/wesnothd wesnothd 2> /dev/null || :
+          -r -d /var/run/wesnothd wesnothd 2> /dev/null || :
 
 
 %post server
@@ -213,8 +214,8 @@ fi
 
 #%ifnarch noarch
 %files
-%doc COPYING changelog README copyright doc/manual/
 %defattr(-,root,root,-)
+%doc COPYING changelog README copyright doc/manual/
 %{_bindir}/%{name}
 
 %files tools
@@ -253,6 +254,49 @@ fi
 #%endif
 
 %changelog
+* Tue Jul 06 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.3-1
+- Upstream maintenance release.
+
+* Mon Jun 07 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.2-1
+- Upstream maintenance release.
+
+* Thu May 13 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.1-2
+- Rebuild for new Boost, BZ 590205.
+
+* Tue May 04 2010 Jon Ciesla <limb at jcomserv.net> - 1.8.1-1
+- Upstream maintenance release.
+
+* Mon Apr 05 2010 Jon Ciesla <limb at jcomserv.net> - 1.8-1
+- New stable.
+
+* Wed Mar 17 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.15-1
+- RC1.
+
+* Thu Mar 11 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.14-1
+- Beta 7.
+
+* Thu Feb 11 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.13-1
+- Beta 6.
+
+* Fri Jan 22 2010 Rahul Sundaram <sundaram at fedoraproject.org> - 1.7.12-2
+- Rebuild for Boost soname bump
+- Fix mixed space and tabs
+- Fix def attr
+
+* Tue Jan 19 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.12-1
+- Beta 5.
+
+* Mon Jan 04 2010 Jon Ciesla <limb at jcomserv.net> - 1.7.11-1
+- Beta 4.
+
+* Tue Dec 15 2009 Jon Ciesla <limb at jcomserv.net> - 1.7.10-1
+- Beta 3.
+
+* Tue Dec 01 2009 Jon Ciesla <limb at jcomserv.net> - 1.7.9-1
+- Beta.
+- Add lua-devel BR, altered autoreconf options.
+- Dropped fribidi patch, upstreamed.
+
 * Sun Sep 06 2009 Warren Togami <wtogami at redhat.com> - 1.6.5-1
 - 1.6.5