diff --git a/.gitignore b/.gitignore index 36e24b3..c8e1afa 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xu4-20100119svn.tar.xz +/xu4-20110124svn.tar.xz diff --git a/sources b/sources index ef1bba3..74b83dc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aeed603541b5238cdb710110195356b1 xu4-20100119svn.tar.xz +8f63eea54be85f81c09cee4eb9aea9c3 xu4-20110124svn.tar.xz diff --git a/xu4-gcc46.patch b/xu4-gcc46.patch new file mode 100644 index 0000000..9d65f69 --- /dev/null +++ b/xu4-gcc46.patch @@ -0,0 +1,11 @@ +diff -up ./src/moongate.cpp.gcc46 ./src/moongate.cpp +--- ./src/moongate.cpp.gcc46 2011-01-24 17:07:50.135961523 -0600 ++++ ./src/moongate.cpp 2011-01-24 17:08:12.663146906 -0600 +@@ -4,6 +4,7 @@ + + #include "vc6.h" // Fixes things if you're using VC6, does nothing if otherwise + ++#include + #include + + #include "error.h" diff --git a/xu4.spec b/xu4.spec index 28a07d2..dfd07e2 100644 --- a/xu4.spec +++ b/xu4.spec @@ -1,10 +1,9 @@ -%define svndate 20110119 -%define svnrev 2776 - +%define svndate 20110124 +%define svnrev 2792 Name: xu4 Version: 1.1 -Release: 0.10.%{svndate}svn%{svnrev}%{?dist} +Release: 0.11.%{svndate}svn%{svnrev}%{?dist} Summary: Ultima IV recreated Group: Amusements/Games License: GPLv2+ @@ -16,6 +15,7 @@ Source2: xu4.autodlrc Source3: u4download.txt Patch0: xu4-zipfile.patch Patch1: xu4-1.0beta3-desktop.patch +Patch10: xu4-gcc46.patch BuildRequires: SDL_mixer-devel libxml2-devel libpng-devel desktop-file-utils Requires: hicolor-icon-theme autodownloader @@ -36,6 +36,7 @@ spirit of the original game will be added. %setup -q -n u4 %patch0 -p1 -z .zipfile %patch1 -p1 -z .desktop +%patch10 -p1 -z .gcc46 if [ "%{_lib}" = "lib64" ]; then sed -i 's|/usr/lib|%{_libdir}|g' src/u4file.cpp fi @@ -97,6 +98,10 @@ fi %changelog +* Mon Jan 24 2011 Jason L Tibbitts III - 1.1-0.11.20110124svn2792 +- Update to latest SVN, just past the beta4 tag made by upstream. +- Add patch for building with gcc46. + * Wed Jan 19 2011 Jason L Tibbitts III - 1.1-0.10.20110119svn2776 - Update to current SVN. Upstream indicates that this should fix bug 666631.