From 5c0b932b4c3dcd339d0ef123c24fb7de427162d5 Mon Sep 17 00:00:00 2001 From: Maarten Vanraes Date: Fri, 27 May 2011 17:36:11 +0200 Subject: make sure make dist will have a tarball that's compilable and spec file to make sure it's rpm-buildable on all rpmbased distros --- manaplus.spec.in | 6 +++++- src/Makefile.am | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/manaplus.spec.in b/manaplus.spec.in index 1e10a19a2..5c71bce64 100644 --- a/manaplus.spec.in +++ b/manaplus.spec.in @@ -6,6 +6,7 @@ Group: Games/Other License: GPLv2+ Url: http://manaplus.evolonline.org/ Source0: http://download.evolonline.org/manaplus/download/%{version}/%{name}-%{version}.tar.bz2 +BuildRoot: %{_topdir}/%{name}-%{version}-root BuildRequires: SDL-devel BuildRequires: SDL_mixer-devel @@ -35,7 +36,7 @@ open source MMORPG. TMW uses 2D graphics and aims to create a large and diverse interactive world. %prep -%setup -q -n manaplus +%setup -q %build %configure2_5x --bindir=%{_gamesbindir} \ @@ -65,6 +66,9 @@ rm -rf %{buildroot} %changelog +* Fri May 27 2011 Maarten Vanraes 1.1.5.15 +- Generalise spec file to work for multiple rpm-based distros + * Sun Apr 17 2011 alien 1.1.4.17-1.mga1 + Revision: 87336 - upgrade to 1.1.4.17 diff --git a/src/Makefile.am b/src/Makefile.am index 684e68ea7..d10d10840 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -260,6 +260,8 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ gui/worldselectdialog.cpp \ gui/worldselectdialog.h \ net/adminhandler.h \ + net/beinghandler.h \ + net/buysellhandler.h \ net/charhandler.cpp \ net/charhandler.h \ net/chathandler.h \ @@ -467,6 +469,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ sprite.h \ statuseffect.cpp \ statuseffect.h \ + SDL_gfxBlitFunc.h \ text.cpp \ text.h \ textmanager.cpp \ @@ -620,7 +623,9 @@ EXTRA_DIST = CMakeLists.txt \ enet/design.txt \ enet/LICENSE \ enet/README \ - mana.rc + mana.rc \ + SDLMain.h \ + SDLMain.m # set the include path found by configure INCLUDES = $(all_includes) -- cgit v1.2.3-60-g2f50