rpms/wesnoth/EL-5 sources,1.21,1.22 wesnoth.spec,1.41,1.42

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26702

Modified Files:
	sources wesnoth.spec 
Log Message:
Let's try the one that works on EL-4. . .



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/EL-5/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	10 Apr 2008 15:01:24 -0000	1.21
+++ sources	9 Oct 2008 15:05:06 -0000	1.22
@@ -1 +1 @@
-99d17b23d2ea4dc3a008f5c69cd43789  wesnoth-1.2.8.tar.bz2
+1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/EL-5/wesnoth.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- wesnoth.spec	22 Sep 2008 14:04:23 -0000	1.41
+++ wesnoth.spec	9 Oct 2008 15:05:06 -0000	1.42
@@ -1,27 +1,21 @@
 Name:           wesnoth
-Version:        1.2.8
-Release:        3%{?dist}
+Version:        1.0.2
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
-License:        GPL+
+License:        GPL
 URL:            http://www.wesnoth.org
-Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
+Source0:        http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz
 Source1:        wesnothd.init
-Source2:        %{name}.sysconfig
+Source2:        wesnoth.sysconfig
+#Source3:        README.fedora
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#No friibidi-devel in ppc, apparently.
-ExcludeArch:	ppc, ppc63, x86_64
 
-BuildRequires:	SDL_image-devel
-BuildRequires:	SDL_mixer-devel
-BuildRequires:  SDL_net-devel
-BuildRequires:	freetype-devel
+BuildRequires:  SDL-devel, SDL_image-devel, SDL_mixer-devel
+BuildRequires:  SDL_ttf-devel, SDL_net-devel, freetype-devel
 BuildRequires:  libpng-devel
-BuildRequires:	fribidi-devel
-BuildRequires:	python-devel
-BuildRequires:  desktop-file-utils
-BuildRequires:	gettext
+BuildRequires:  desktop-file-utils, gettext
 
 
 %description
@@ -50,7 +44,6 @@
 Requires(preun): /sbin/chkconfig
 Requires(pre): /usr/sbin/useradd
 
-
 %description server
 This package contains the binaries for running a Wesnoth server
 for multi-player games.
@@ -61,13 +54,13 @@
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
 
-
 %description tools
 This package contains the game editor and development tools.
 
 
 %prep
 %setup -q
+#cp %{SOURCE3} .
 chmod -x MANUAL*
 
 
@@ -77,7 +70,6 @@
     --enable-editor \
     --enable-tools \
     --enable-server \
-    --enable-python \
     --with-fifodir=/var/run/wesnothd \
     --with-server-uid=$(id -u) \
     --with-server-gid=$(id -g) 
@@ -90,7 +82,7 @@
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
-                     icons/%{name}.desktop
+                     --add-category="X-Fedora" icons/%{name}.desktop
 # add icon for menus
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
@@ -138,7 +130,8 @@
 %files -f %{name}.\*.lang
 %defattr(-,root,root,-)
 %doc COPYING changelog README copyright MANUAL*
-%{_bindir}/%{name}
+#%doc README.fedora
+%{_bindir}/wesnoth
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
@@ -150,6 +143,7 @@
 %{_bindir}/wesnoth_editor
 %{_bindir}/exploder
 %{_bindir}/cutter
+%{_bindir}/wmlxgettext
 %{_mandir}/man6/wesnoth_editor.6*
 %{_mandir}/*/man6/wesnoth_editor.6*
 
@@ -164,53 +158,6 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
-* Tue Jul 22 2008 Jon Ciesla <limb at jcomserv.net> - 1.2.8-3
-- ExArch ppc, no fribidi?
-
-* Sat Dec  1 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.8-2
-- Update to 1.2.8. Fixes #405661 (CVE-2007-5742)
-- Enable python support.
-- Update licence tag.
-
-* Sat Apr 21 2007 Warren Togami <wtogami at redhat.com> - 1.2.4-1
-- 1.2.4
-
-* Fri Mar 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.3-1
-- Update to 1.2.3.
-
-* Sat Feb 24 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.2-2
-- Bump.
-
-* Sat Feb 24 2007 Warren Togami <wtogami at redhat.com> - 1.2.2-1
-- 1.2.2
-
-* Mon Jan 15 2007 Brian Pepple <bpepple at fedoraproject.org> - 1.2.1-1
-- Update to 1.2.1.
-
-* Sun Dec 24 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2-1
-- Update to 1.2.
-
-* Sat Dec 23 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.1.14-1
-- Update to 1.1.14.
-- Add BR on fribidi-devel.
-- Drop X-Fedora category from desktop file.
-- Drop help speedup patch, fixed upstream.
-- Drop ttf patch, fixed upstream.
-
-* Thu Sep  7 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.0.2-4
-- Rebuild for FC6.
-- Remove unnecessary BR on SDL-devel.
-
-* Tue Jul 18 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-3
-- fix #199079, so loading some help pages like the "License" doesn't
-  take ages
-- remove BR SDL_ttf-devel, an included/patched copy is used since 0.8.7
-- patch included SDL_ttf to build with freetype 2.x and not access
-  an old freetype 1.x internal
-
-* Wed Feb 15 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-2
-- rebuilt for FC5
-
 * Wed Dec 21 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.2-1
 - update to 1.0.2