rpms/wesnoth/FC-6 .cvsignore, 1.13, 1.14 sources, 1.13, 1.14 wesnoth.spec, 1.29, 1.30 wesnoth-1.0.2-help-speedup-199079.patch, 1.1, NONE wesnoth-1.0.2-sdl_ttf.patch, 1.1, NONE

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/wesnoth/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8419

Modified Files:
	.cvsignore sources wesnoth.spec 
Removed Files:
	wesnoth-1.0.2-help-speedup-199079.patch 
	wesnoth-1.0.2-sdl_ttf.patch 
Log Message:
* Sun Dec 24 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2-1
- Update to 1.2.
- Add BR on fribidi-devel.
- Drop X-Fedora category from desktop file.
- Drop help speedup patch, fixed upstream.
- Drop ttf patch, fixed upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-6/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	21 Dec 2005 19:34:55 -0000	1.13
+++ .cvsignore	24 Dec 2006 16:21:47 -0000	1.14
@@ -1 +1 @@
-wesnoth-1.0.2.tar.gz
+wesnoth-1.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	21 Dec 2005 19:34:55 -0000	1.13
+++ sources	24 Dec 2006 16:21:47 -0000	1.14
@@ -1 +1 @@
-1d2a26062ce1c90cbf10845023f9435c  wesnoth-1.0.2.tar.gz
+722a459282abe6d04dbe228d031c088e  wesnoth-1.2.tar.gz


Index: wesnoth.spec
===================================================================
RCS file: /cvs/extras/rpms/wesnoth/FC-6/wesnoth.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- wesnoth.spec	8 Sep 2006 00:45:36 -0000	1.29
+++ wesnoth.spec	24 Dec 2006 16:21:47 -0000	1.30
@@ -1,16 +1,14 @@
 Name:           wesnoth
-Version:        1.0.2
-Release:        4%{?dist}
+Version:        1.2
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://www.wesnoth.org
-Source0:        http://www.wesnoth.org/files/wesnoth-%{version}.tar.gz
+Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.gz
 Source1:        wesnothd.init
-Source2:        wesnoth.sysconfig
-Patch0:         wesnoth-1.0.2-sdl_ttf.patch
-Patch1:         wesnoth-1.0.2-help-speedup-199079.patch
+Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL_image-devel
@@ -18,6 +16,7 @@
 BuildRequires:  SDL_net-devel
 BuildRequires:	freetype-devel
 BuildRequires:  libpng-devel
+BuildRequires:	fribidi-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:	gettext
 
@@ -48,6 +47,7 @@
 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.
@@ -58,14 +58,13 @@
 Group:		Amusements/Games
 Requires:	%{name} = %{version}-%{release}
 
+
 %description tools
 This package contains the game editor and development tools.
 
 
 %prep
 %setup -q
-%patch0 -p1 -b .sdl_ttf
-%patch1 -p1 -b .help-199079
 chmod -x MANUAL*
 
 
@@ -87,7 +86,7 @@
 
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
-                     --add-category="X-Fedora" icons/%{name}.desktop
+                     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
@@ -135,7 +134,7 @@
 %files -f %{name}.\*.lang
 %defattr(-,root,root,-)
 %doc COPYING changelog README copyright MANUAL*
-%{_bindir}/wesnoth
+%{_bindir}/%{name}
 %{_datadir}/%{name}
 %{_datadir}/applications/*
 %{_datadir}/pixmaps/*
@@ -162,6 +161,13 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Sun Dec 24 2006 Brian Pepple <bpepple at fedoraproject.org> - 1.2-1
+- Update to 1.2.
+- 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.


--- wesnoth-1.0.2-help-speedup-199079.patch DELETED ---


--- wesnoth-1.0.2-sdl_ttf.patch DELETED ---