diff --git a/.cvsignore b/.cvsignore index 3f6e8cc..73417e7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -wesnoth-1.4.1.tar.bz2 +wesnoth-1.4.6.tar.bz2 diff --git a/sources b/sources index e808355..7d6bd5d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -09b7b76d4a4eedf502f38df9d551d827 wesnoth-1.4.5.tar.bz2 +9e92234b29f062b3779750ba3cd0a71b wesnoth-1.4.6.tar.bz2 diff --git a/wesnoth-1.2.8-remove-ogg-test.patch b/wesnoth-1.2.8-remove-ogg-test.patch deleted file mode 100644 index 7fe4ee6..0000000 --- a/wesnoth-1.2.8-remove-ogg-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ur wesnoth-1.2.8.OLD/configure.ac wesnoth-1.2.8/configure.ac ---- wesnoth-1.2.8.OLD/configure.ac 2007-11-25 06:37:12.000000000 -0500 -+++ wesnoth-1.2.8/configure.ac 2007-11-30 14:21:07.000000000 -0500 -@@ -798,23 +798,6 @@ - LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS" - - ac_link="$LDPREFIX $ac_link" -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -- #include -- #include -- -- int main(int argc, char **argv) -- { -- Mix_Music* music = Mix_LoadMUS("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 diff --git a/wesnoth.spec b/wesnoth.spec index ff38adc..c19f070 100644 --- a/wesnoth.spec +++ b/wesnoth.spec @@ -1,6 +1,6 @@ %define _default_patch_fuzz 2 Name: wesnoth -Version: 1.4.5 +Version: 1.4.6 Release: 1%{?dist} Summary: Turn-based strategy game with a fantasy theme @@ -14,6 +14,7 @@ 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) +Requires: wesnoth-data = %{version} BuildRequires: SDL_image-devel BuildRequires: SDL_mixer-devel BuildRequires: SDL_net-devel @@ -45,7 +46,7 @@ be played out. You can create your own custom units, and write your own scenarios--or even full-blown campaigns. You can also challenge your friends--or strangers--and fight multi-player epic fantasy battles. - +%ifnarch noarch %package server Summary: %{summary} Group: Amusements/Games @@ -69,17 +70,27 @@ Requires: %{name} = %{version}-%{release} %description tools This package contains the game editor and development tools. +%else +%package data +Summary: %{summary} +Group: Amusements/Games +Requires: %{name} = %{version} + +%description data +This package contains the data files for Wesnoth. +%endif %prep %setup -q %patch0 -p1 -b .gcc43 %patch1 -p0 autoreconf -#chmod -x MANUAL* %build -%configure --disable-dependency-tracking \ +# Cannot use configure macro because noarch-redhat-linux is not recognized by the auto tools in the tarball +./configure --prefix=%{_prefix} --exec-prefix=%{_prefix} --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} --datadir=%{_datadir} --includedir=%{_includedir} --libdir=%{_libdir} --libexecdir=%{_libexecdir} --localstatedir=%{_localstatedir} --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} --infodir=%{_infodir} \ + --disable-dependency-tracking \ --with-localedir=%{_datadir}/locale \ --enable-editor \ --enable-tools \ @@ -88,30 +99,37 @@ autoreconf --with-fifodir=/var/run/wesnothd \ --with-server-uid=$(id -u) \ --with-server-gid=$(id -g) +%ifnarch noarch make %{?_smp_mflags} +%endif %install rm -rf $RPM_BUILD_ROOT -make install DESTDIR=${RPM_BUILD_ROOT} +%ifarch noarch +### Data Files and Desktop Files +make install-data DESTDIR=${RPM_BUILD_ROOT} +rm -rf $RPM_BUILD_ROOT%{_datadir}/applications 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 +ln -sf ../wesnoth/icons/%{name}-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps +ln -sf ../wesnoth/icons/%{name}_editor-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps + +%find_lang %{name}.\* -install -m 644 icons/%{name}_editor-icon.png $RPM_BUILD_ROOT/%{_datadir}/pixmaps + +%else +### Binaries and Config Files +make install-exec DESTDIR=${RPM_BUILD_ROOT} + +desktop-file-install --dir $RPM_BUILD_ROOT/%{_datadir}/applications \ + --mode="0644" --vendor fedora \ + icons/%{name}_editor.desktop # arrange server package files mkdir -p ${RPM_BUILD_ROOT}%{_sbindir} @@ -123,20 +141,25 @@ install -Dpm 755 %{SOURCE1} \ install -Dpm 644 %{SOURCE2} \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/wesnoth -%find_lang %{name}.\* -#/usr/lib/rpm/find-lang.sh $RPM_BUILD_ROOT %name --all-name +%endif + +### Cleanup Stuff +rm -f $RPM_BUILD_ROOT/usr/share/applications/wesnoth* +rm -f $RPM_BUILD_ROOT/usr/share/wesnoth/icons/*.desktop find $RPM_BUILD_ROOT -name ".cvs*" | xargs rm -f find $RPM_BUILD_ROOT -name "CVS" | xargs rm -rf +find $RPM_BUILD_ROOT/ -name 'Makefile*' |xargs rm -f 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 +%ifarch noarch %post touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then @@ -148,7 +171,9 @@ touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi +%endif +%ifnarch noarch %pre server /usr/sbin/useradd -c "Wesnoth server" -s /sbin/nologin \ -r -d /var/run/wesnothd wesnothd 2> /dev/null || : @@ -166,17 +191,13 @@ if [ $1 -eq 0 ]; then %{_initrddir}/wesnothd stop >/dev/null 2>&1 || : /sbin/chkconfig --del wesnothd fi +%endif - -%files -f %{name}.\*.lang -%defattr(-,root,root,-) +%ifnarch noarch +%files %doc COPYING changelog README copyright doc/manual/ +%defattr(-,root,root,-) %{_bindir}/%{name} -%{_datadir}/%{name} -%{_datadir}/applications/fedora-wesnoth.desktop -%{_datadir}/pixmaps/* -%{_mandir}/man6/wesnoth.6* -%{_mandir}/*/man6/wesnoth.6* %files tools %defattr(-,root,root,-) @@ -187,20 +208,38 @@ fi %{_bindir}/wmllint %{_bindir}/wmlscope %{_datadir}/applications/fedora-wesnoth_editor.desktop -%{_mandir}/man6/wesnoth_editor.6* -%{_mandir}/*/man6/wesnoth_editor.6* %files server %defattr(-,root,root,-) %config %{_initrddir}/wesnothd %config(noreplace) %{_sysconfdir}/sysconfig/wesnoth %{_sbindir}/wesnothd -%{_mandir}/man6/wesnothd.* -%{_mandir}/*/man6/wesnothd.* %attr(0700,wesnothd,wesnothd) %dir /var/run/wesnothd/ %ghost /var/run/wesnothd/socket +%endif + +%ifarch noarch +%files data -f %{name}.\*.lang +%defattr(-,root,root,-) +%{_datadir}/%{name} +%{_datadir}/applications/fedora-wesnoth.desktop +%{_datadir}/pixmaps/* +%{_mandir}/man6/wesnoth.6* +%{_mandir}/*/man6/wesnoth.6* +%{_mandir}/man6/wesnoth_editor.6* +%{_mandir}/*/man6/wesnoth_editor.6* +%{_mandir}/man6/wesnothd.* +%{_mandir}/*/man6/wesnothd.* + +%endif %changelog +* Tue Nov 18 2008 Warren Togami +- split into -data noarch subpackage to save mirror space + +* Mon Nov 17 2008 Jon Ciesla - 1.4.6-1 +- New upstream release. + * Tue Sep 09 2008 Jon Ciesla - 1.4.5-1 - New upstream release.