Merge pull request #95 from Mixaill/version-bump

Version bump for Linux and RPM update

CMakeLists.txt

@@ -13,7 +13,7 @@ endif()
 
 # VCMI version
 set(VCMI_VERSION_MAJOR 0)
-set(VCMI_VERSION_MINOR 97)
+set(VCMI_VERSION_MINOR 98)
 set(VCMI_VERSION_PATCH 0)
 
 option(ENABLE_ERM "Enable compilation of ERM scripting module" OFF)

debian/changelog

@@ -1,3 +1,9 @@
+vcmi (0.98) trusty; urgency=medium
+
+  * New upstream release
+
+ -- Ivan Savenko <[email protected]>  Wed, 01 Apr 2015 22:57:38 +0200
+
 vcmi (0.97) trusty; urgency=medium
 
   * New upstream release

rpm/vcmi.spec

@@ -1,23 +1,26 @@
-Summary:			VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, giving it new and extended possibilities.
+Summary:			VCMI is an open-source project aiming to reimplement HoMM3 game engine, giving it new and extended possibilities.
 Name:				vcmi
-Version:			0.9.5
+Version:			0.98
 Release:			1%{?dist}
 License:			GPLv2+
 Group:				Amusements/Games
 
+%define _unpackaged_files_terminate_build 0
+
 # The source for this package was pulled from upstream's vcs.  Use the
 # following commands to generate the tarball:
-#  svn export -r HEAD https://svn.code.sf.net/p/vcmi/code/tags/0.95 vcmi-0.9.5-1
-#  tar -cJf vcmi-0.9.5-1.tar.xz vcmi-0.9.5-1
-Source:				vcmi-0.9.5-1.tar.xz
+#  wget https://github.com/vcmi/vcmi/archive/0.98.tar.gz
+#  tar -xzf 0.98.tar.gz vcmi-0.98-1
+Source:				vcmi-0.98-1.tar.gz
 
 URL:				http://forum.vcmi.eu/portal.php
+
 BuildRequires:		cmake
 BuildRequires:		gcc-c++ >= 4.7.2
-BuildRequires:		SDL-devel
-BuildRequires:		SDL_image-devel
-BuildRequires:		SDL_ttf-devel
-BuildRequires:		SDL_mixer-devel >= 1.2.8
+BuildRequires:		SDL2-devel
+BuildRequires:		SDL2_image-devel
+BuildRequires:		SDL2_ttf-devel
+BuildRequires:		SDL2_mixer-devel
 BuildRequires:		boost >= 1.51
 BuildRequires:		boost-devel >= 1.51
 BuildRequires:		boost-filesystem >= 1.51
@@ -32,13 +35,13 @@ BuildRequires:		ffmpeg-libs
 BuildRequires:		qt5-qtbase-devel
 
 %description
-VCMI is an open-source project aiming to reimplement HMM3:WoG game engine, giving it new and extended possibilities. 
+VCMI is an open-source project aiming to reimplement HoMM3 game engine, giving it new and extended possibilities.
 
 %prep
 %setup -q -n %{name}-%{version}-1
 
 %build
-cmake -DCMAKE_INSTALL_PREFIX=/usr ./ -DENABLE_LAUNCHER=ON -DENABLE_PCH=ON
+cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ./
 make %{?_smp_mflags}
 
 %install
@@ -46,7 +49,7 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 
 %files
-%doc README README.linux COPYING AUTHORS ChangeLog
+%doc README.md README.linux license.txt AUTHORS ChangeLog
 %{_bindir}/vcmiclient
 %{_bindir}/vcmiserver
 %{_bindir}/vcmibuilder
@@ -58,29 +61,38 @@ make DESTDIR=%{buildroot} install
 %{_datadir}/icons/*
 
 %changelog
-* Sat Mar 01 2014 VCMI - 0.9.5-1
+* Wed Apr 01 2015 VCMI - 0.98-1
+- New upstream release
+
+* Sun Nov 02 2014 VCMI - 0.97-1
+- New upstream release
+
+* Tue Jul 01 2014 VCMI - 0.96-1
+- New upstream release
+
+* Sat Mar 01 2014 VCMI - 0.95-1
 - New upstream release
 
-* Wed Oct 02 2013 VCMI - 0.9.4-1
+* Wed Oct 02 2013 VCMI - 0.94-1
 - New upstream release
 
-* Sun Jun 02 2013 VCMI - 0.9.3-1
+* Sun Jun 02 2013 VCMI - 0.93-1
 - New upstream release
 
-* Wed Mar 06 2013 VCMI - 0.9.2-1
+* Wed Mar 06 2013 VCMI - 0.92-1
 - New upstream release
 
-* Fri Feb 01 2013 VCMI - 0.9.1-2
+* Fri Feb 01 2013 VCMI - 0.91-2
 - New upstream release
 
-* Wed Jan 30 2013 VCMI - 0.9.1-1
+* Wed Jan 30 2013 VCMI - 0.91-1
 - Development release
 
-* Sun Oct 21 2012 VCMI - 0.9-2
-- Second release of 0.9, Fixed battles crash
+* Sun Oct 21 2012 VCMI - 0.90-2
+- Second release of 0.90, Fixed battles crash
 
-* Sat Oct 06 2012 VCMI - 0.9-1
+* Sat Oct 06 2012 VCMI - 0.90-1
 - New upstream release
 
-* Sun Jun 08 2012 VCMI - 0.89-1
+* Fri Jun 08 2012 VCMI - 0.89-1
 - Initial version