diff --git a/README.linux b/README.linux index 5905424fe..68c8ada6e 100644 --- a/README.linux +++ b/README.linux @@ -42,25 +42,18 @@ You can get latest sources with subversion: cd trunk svn co https://vcmi.svn.sourceforge.net/svnroot/vcmi/trunk src - III. Compilation -On linux distributions like Fedora Mp3 support isn't given for the time being. -There is a mantis call here: http://bugs.vcmi.eu/view.php?id=933. - -(Fedora-only?) - Create a directory that will contain the shared libraries. (default is usually /usr/local/lib64/vcmi) - Run configure: - cd trunk/build - cmake ../src + mkdir build && cd build + cmake ../src -DCMAKE_BUILD_TYPE=Debug (to enable debugging) Notice: The ../src/ is not a typo, it will place makefile scripts into the build dir as the build dir is your working dir when calling CMake. Then build vcmi: - make + make -j2 (j2 = compile with 2 cpu cores, you can specifiy any value) That will generate vcmiclient, vcmiserver as well as 3 .so libraries. diff --git a/rpm/vcmi.spec b/rpm/vcmi.spec index 345c906a0..b99936ff2 100644 --- a/rpm/vcmi.spec +++ b/rpm/vcmi.spec @@ -1,18 +1,18 @@ Summary: VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, giving it new and extended possibilities. Name: vcmi Version: 0.9 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Amusements/Games # The source for this package was pulled from upstream's vcs. Use the # following commands to generate the tarball: -# svn export -r HEAD https://vcmi.svn.sourceforge.net/svnroot/vcmi/tags/0.9 vcmi-0.9-1 -# tar -cJf vcmi-0.9-1.tar.xz vcmi-0.9-1 -Source: vcmi-0.9-1.tar.xz +# svn export -r HEAD https://vcmi.svn.sourceforge.net/svnroot/vcmi/tags/0.9 vcmi-0.9-2 +# tar -cJf vcmi-0.9-2.tar.xz vcmi-0.9-2 +Source: vcmi-0.9-2.tar.xz URL: http://forum.vcmi.eu/portal.php -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ >= 4.7.2 BuildRequires: SDL-devel BuildRequires: SDL_image-devel BuildRequires: SDL_ttf-devel @@ -36,7 +36,7 @@ VCMI is fan-made open-source project in progress. We already allow support for m As yet VCMI is not standalone program, it uses Wake of Gods files and graphics. You need to install WoG before running VCMI. %prep -%setup -q -n %{name}-%{version}-1 +%setup -q -n %{name}-%{version}-2 %build cmake -DCMAKE_INSTALL_PREFIX=/usr ./ @@ -57,6 +57,9 @@ make DESTDIR=%{buildroot} install %{_datadir}/icons/* %changelog +* Sun Oct 21 2012 VCMI - 0.9-2 +- Second release of 0.9, Fixed battles crash + * Sat Oct 06 2012 VCMI - 0.9-1 - New upstream release