rpms/wesnoth/devel wesnoth-1.3.16-remove-ogg-test.patch, NONE, 1.1 .cvsignore, 1.23, 1.24 sources, 1.23, 1.24 wesnoth.spec, 1.48, 1.49

Tue Feb 26 12:12:23 UTC 2008

Author: limb

Update of /cvs/pkgs/rpms/wesnoth/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21330

Modified Files:
	.cvsignore sources wesnoth.spec 
Added Files:
	wesnoth-1.3.16-remove-ogg-test.patch 
Log Message:
Update to 1.3.16.


wesnoth-1.3.16-remove-ogg-test.patch:

--- NEW FILE wesnoth-1.3.16-remove-ogg-test.patch ---
--- configure.ac	2008-02-22 14:10:36.000000000 -0600
+++ configure.ac	2008-02-22 14:10:36.000000000 -0600
@@ -890,23 +890,6 @@
 	LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
 
 	ac_link="$LDPREFIX $ac_link"
-        AC_RUN_IFELSE([AC_LANG_SOURCE([
-	#include <SDL_mixer.h>
-        #include <stdlib.h>
-
-	int main(int argc, char **argv)
-        {
-	    Mix_Music* music = Mix_LoadMUS("data/core/music/main_menu.ogg");
-	    if (music == NULL)
-		exit(1);
-	    exit(0);
-        }
-	])],
-	[AC_MSG_RESULT(yes)],
-	[AC_MSG_RESULT(no)]
-	[AC_MSG_ERROR([*** SDL_mixer has no OGG support! You need SDL_mixer with OGG support])],
-	[AC_MSG_RESULT([not tested in cross-compiling])])
-
 
         CPPFLAGS=$OLD_CPPFLAGS
         CFLAGS=$OLD_CFLAGS


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	29 Nov 2007 20:05:10 -0000	1.23
+++ .cvsignore	26 Feb 2008 12:11:36 -0000	1.24
@@ -1 +1 @@
-wesnoth-1.2.8.tar.bz2
+wesnoth-1.3.16.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	29 Nov 2007 20:05:10 -0000	1.23
+++ sources	26 Feb 2008 12:11:36 -0000	1.24
@@ -1 +1 @@
-99d17b23d2ea4dc3a008f5c69cd43789  wesnoth-1.2.8.tar.bz2
+4179a2a482c398b7f71870381dbef041  wesnoth-1.3.16.tar.bz2


Index: wesnoth.spec
===================================================================
RCS file: /cvs/pkgs/rpms/wesnoth/devel/wesnoth.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- wesnoth.spec	12 Feb 2008 02:22:40 -0000	1.48
+++ wesnoth.spec	26 Feb 2008 12:11:36 -0000	1.49
@@ -1,16 +1,16 @@
 Name:           wesnoth
-Version:        1.2.8
-Release:        5%{?dist}
+Version:        1.3.16
+Release:        1%{?dist}
 Summary:        Turn-based strategy game with a fantasy theme
 
 Group:          Amusements/Games
-License:        GPL+
+License:        GPLv2+
 URL:            http://www.wesnoth.org
 Source0:        http://www.%{name}.org/files/%{name}-%{version}.tar.bz2
 Source1:        wesnothd.init
 Source2:        %{name}.sysconfig
-Patch0:		%{name}-%{version}-remove-ogg-test.patch
-Patch1:         %{name}-%{version}-gcc43.patch
+Patch0:         %{name}-1.2.8-gcc43.patch
+Patch1:		wesnoth-1.3.16-remove-ogg-test.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	SDL_image-devel
@@ -22,10 +22,10 @@
 BuildRequires:	python-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:	gettext
+BuildRequires:	boost-devel
 # Drop these when ogg test patch is removed.
-BuildRequires:	autoconf
-BuildRequires:	automake
-
+BuildRequires:  autoconf
+BuildRequires:  automake
 
 %description
 The Battle for Wesnoth is a turn-based strategy game with a fantasy theme.
@@ -71,10 +71,10 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .ogg
-%patch1 -p1 -b .gcc43
+%patch0 -p1 -b .gcc43
+%patch1 -p0
 autoreconf
-chmod -x MANUAL*
+#chmod -x MANUAL*
 
 
 %build
@@ -97,10 +97,21 @@
 desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
                      --mode="0644" --vendor fedora \
                      icons/%{name}.desktop
+
+desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \
+                     --mode="0644" --vendor fedora \
+                     icons/%{name}_editor.desktop
+
+#clean up extraneous .desktop files.
+rm -f $RPM_BUILD_ROOT/usr/share/applications/wesnoth*
+rm -f $RPM_BUILD_ROOT/usr/share/wesnoth/icons/*.desktop
+
 # add icon for menus
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 install -m 644 images/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
 
+install -m 644 icons/%{name}_editor-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps
+
 # arrange server package files
 mkdir -p ${RPM_BUILD_ROOT}%{_sbindir}
 mv ${RPM_BUILD_ROOT}%{_bindir}/wesnothd ${RPM_BUILD_ROOT}%{_sbindir}
@@ -117,10 +128,25 @@
 find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f
 find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf
 
+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/wesnoth*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %pre server
 /usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \
@@ -143,10 +169,10 @@
 
 %files -f %{name}.\*.lang
 %defattr(-,root,root,-)
-%doc COPYING changelog README copyright MANUAL*
+%doc COPYING changelog README copyright doc/manual/
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/fedora-wesnoth.desktop
 %{_datadir}/pixmaps/*
 %{_mandir}/man6/wesnoth.6*
 %{_mandir}/*/man6/wesnoth.6*
@@ -156,6 +182,10 @@
 %{_bindir}/wesnoth_editor
 %{_bindir}/exploder
 %{_bindir}/cutter
+%{_bindir}/wmlindent
+%{_bindir}/wmllint
+%{_bindir}/wmlscope
+%{_datadir}/applications/fedora-wesnoth_editor.desktop
 %{_mandir}/man6/wesnoth_editor.6*
 %{_mandir}/*/man6/wesnoth_editor.6*
 
@@ -170,6 +200,13 @@
 %ghost /var/run/wesnothd/socket
 
 %changelog
+* Fri Feb 15 2008 Jon Ciesla <limb at jcomserv.net> - 1.3.16-1
+- Update to 1.3.16.
+- Updated ogg test patch.
+- Corrected license tag.
+- Added boost-devel BR.
+- Corrected .desktop/icon handling for subpackage.
+
 * Mon Feb 11 2008 Warren Togami <wtogami at redhat.com> - 1.2.8-5
 - Patch to fix build with gcc-4.3.
 


