rpms/wesnoth/devel .cvsignore, 1.31, 1.32 sources, 1.31, 1.32 wesnoth.spec, 1.65, 1.66

[Jon Ciesla]

Author: limb

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

Modified Files:
	.cvsignore sources wesnoth.spec 
Log Message:
1.5.11.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore	28 Dec 2008 19:28:18 -0000	1.31
+++ .cvsignore	25 Feb 2009 16:07:54 -0000	1.32
@@ -1 +1 @@
-wesnoth-1.4.7.tar.bz2
+wesnoth-1.5.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources	28 Dec 2008 19:28:18 -0000	1.31
+++ sources	25 Feb 2009 16:07:54 -0000	1.32
@@ -1 +1 @@
-fdd341c3d66bf1bea2113c79db852d68  wesnoth-1.4.7.tar.bz2
+1ff0c080dc83621f78fd65e942cc64a4  wesnoth-1.5.11.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- wesnoth.spec	28 Dec 2008 19:25:23 -0000	1.65
+++ wesnoth.spec	25 Feb 2009 16:07:54 -0000	1.66
@@ -1,5 +1,5 @@
 Name:           wesnoth
-Version:        1.4.7
+Version:        1.5.11
 Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
@@ -45,7 +45,7 @@
 scenarios--or even full-blown campaigns. You can also challenge your
 friends--or strangers--and fight multi-player epic fantasy battles.
 
-%ifnarch noarch
+##%ifnarch noarch
 %package server
 Summary:	%{summary}
 Group:		Amusements/Games
@@ -69,15 +69,16 @@
 %description tools
 This package contains the game editor and development tools.
 
-%else
+##%else
 %package data
 Summary:	%{summary}
 Group:		Amusements/Games
 Requires:	%{name} = %{version}
+BuildArch:	noarch
 
 %description data
 This package contains the data files for Wesnoth.
-%endif
+##%endif
 
 %prep
 %setup -q
@@ -98,14 +99,14 @@
     --with-fifodir=/var/run/wesnothd \
     --with-server-uid=$(id -u) \
     --with-server-gid=$(id -g) 
-%ifnarch noarch
+#%ifnarch noarch
 make %{?_smp_mflags}
-%endif
+#%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%ifarch noarch
+#%ifarch noarch
 ### Data Files and Desktop Files
 make install-data DESTDIR=${RPM_BUILD_ROOT}
 rm -rf $RPM_BUILD_ROOT%{_datadir}/applications
@@ -131,7 +132,7 @@
 %find_lang %{name}.\*
 
 
-%else
+#%else
 ### Binaries and Config Files
 make install-exec DESTDIR=${RPM_BUILD_ROOT}
 
@@ -149,7 +150,7 @@
 install -Dpm 644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth
 
-%endif
+#%endif
 
 ### Cleanup Stuff
 rm -f $RPM_BUILD_ROOT/usr/share/applications/wesnoth*
@@ -162,12 +163,12 @@
 rm -rf $RPM_BUILD_ROOT/usr/share/doc/wesnoth/
 rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth-icon.png
 rm -f $RPM_BUILD_ROOT/usr/share/icons/wesnoth_editor-icon.png
-
+rm -f $RPM_BUILD_ROOT/usr/share/applications/fedora-wesnoth_editor.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%ifarch noarch
+#%ifarch noarch
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -179,9 +180,9 @@
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
-%endif
+#%endif
 
-%ifnarch noarch
+#%ifnarch noarch
 %pre server
 /usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
 	-r -d /var/run/wesnothd wesnothd 2> /dev/null || :
@@ -199,9 +200,9 @@
     %{_initrddir}/wesnothd stop >/dev/null 2>&1 || :
     /sbin/chkconfig --del wesnothd
 fi
-%endif
+#%endif
 
-%ifnarch noarch
+#%ifnarch noarch
 %files
 %doc COPYING changelog README copyright doc/manual/
 %defattr(-,root,root,-)
@@ -209,13 +210,14 @@
 
 %files tools
 %defattr(-,root,root,-)
-%{_bindir}/wesnoth_editor
+#%{_bindir}/wesnoth_editor
+%{_bindir}/wesnoth_addon_manager
 %{_bindir}/exploder
 %{_bindir}/cutter
 %{_bindir}/wmlindent
 %{_bindir}/wmllint
 %{_bindir}/wmlscope
-%{_datadir}/applications/fedora-wesnoth_editor.desktop
+#%{_datadir}/applications/fedora-wesnoth_editor.desktop
 
 %files server
 %defattr(-,root,root,-)
@@ -224,9 +226,9 @@
 %{_sbindir}/wesnothd
 %attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/
 %ghost /var/run/wesnothd/socket
-%endif
+#%endif
 
-%ifarch noarch
+#%ifarch noarch
 %files data -f %{name}.\*.lang
 %defattr(-,root,root,-)
 %{_datadir}/%{name}
@@ -234,14 +236,28 @@
 %{_datadir}/pixmaps/*
 %{_mandir}/man6/wesnoth.6*
 %{_mandir}/*/man6/wesnoth.6*
-%{_mandir}/man6/wesnoth_editor.6*
-%{_mandir}/*/man6/wesnoth_editor.6*
+#%{_mandir}/man6/wesnoth_editor.6*
+#%{_mandir}/*/man6/wesnoth_editor.6*
 %{_mandir}/man6/wesnothd.*
 %{_mandir}/*/man6/wesnothd.*
 
-%endif
+#%endif
 
 %changelog
+* Wed Feb 25 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.11-1
+- Update to dev version 1.5.11.
+
+* Tue Feb 24 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.10-1
+- Update to dev version 1.5.10.
+- Move data to noarch.
+
+* Wed Feb 04 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.9-1
+- Update to dev version 1.5.9.
+
+* Mon Feb 02 2009 Jon Ciesla <limb at jcomserv.net> - 1.5.8-1
+- Update to dev version 1.5.8.
+- Redifed remove-ogg-test patch.
+
 * Sun Dec 28 2008 Warren Togami <wtogami at redhat.com> - 1.4.7-1
 - 1.4.7
 - Remove font requirement