summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore9
-rw-r--r--Makefile.am9
-rwxr-xr-xconfigure.ac2
-rw-r--r--docs/Makefile.am4
-rw-r--r--manaplus.spec.in (renamed from manaplus.spec)7
5 files changed, 23 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 4a8456907..0bbca0a9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ depcomp
install-sh
m4/
missing
+compile
po/Makefile.in.in
po/Makevars.template
po/Rules-quot
@@ -33,6 +34,7 @@ config.status.lineno
po/POTFILES
.deps
stamp-h1
+manaplus.spec
# files created by CMake
CMakeFiles/
@@ -106,6 +108,10 @@ GRTAGS
GSYMS
GTAGS
+# tarballs generated by make dist
+manaplus-*.tar.gz
+manaplus-*.tar.bz2
+
# generated for nsis build
translations/*
@@ -118,3 +124,6 @@ gmon.out
# patch files created by git
[0-9][0-9][0-9][0-9]-*.patch
+
+# backup files created by vi
+*~
diff --git a/Makefile.am b/Makefile.am
index 808de717d..f1909aee4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -13,8 +13,13 @@ EXTRA_DIST = $(desktop_DATA) \
CMake/Modules/FindGuichan.cmake \
CMake/Modules/FindLibIntl.cmake \
CMake/Modules/FindSDL_gfx.cmake \
- mana.cbp \
- manaplus.menu
+ manaplus.cbp \
+ manaplus.menu \
+ manaplus.spec \
+ AUTHORS \
+ ChangeLog \
+ INSTALL \
+ README
# Autopoint m4 stuff
ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index d76f687ca..e21df8e57 100755
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_LANG_CPLUSPLUS
# Checks for programs.
AC_PROG_CXX
+AM_PROG_CC_C_O
AC_PROG_INSTALL
# Checks for typedefs, structures, and compiler characteristics.
@@ -168,6 +169,7 @@ esac],[memdebug_enabled=false])
AM_CONDITIONAL(ENABLE_MEM_DEBUG, test x$memdebug_enabled = xtrue)
AC_CONFIG_FILES([
+manaplus.spec
Makefile
src/Makefile
data/Makefile
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 9ea3cbafc..a13637c29 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -5,5 +5,5 @@ EXTRA_DIST = $(man6_MANS) \
FAQ.txt \
HACKING.txt \
SOURCE/Doxyfile \
- items.txt \
- progression.txt
+ sounddev.txt \
+ clientupdates.txt
diff --git a/manaplus.spec b/manaplus.spec.in
index 34763e25a..1e10a19a2 100644
--- a/manaplus.spec
+++ b/manaplus.spec.in
@@ -1,6 +1,6 @@
Name: manaplus
-Version: 1.1.4.17
-Release: %mkrel 1
+Version: @PACKAGE_VERSION@
+Release: 1-manaplus
Summary: A client for Evol Online and The Mana World: 2D MMORPG
Group: Games/Other
License: GPLv2+
@@ -38,7 +38,6 @@ diverse interactive world.
%setup -q -n manaplus
%build
-autoreconf -i
%configure2_5x --bindir=%{_gamesbindir} \
--datadir=%{_gamesdatadir} \
--disable-rpath
@@ -98,4 +97,4 @@ rm -rf %{buildroot}
* Tue Jan 05 2010 Jérôme Brenier <incubusss@mandriva.org> 0.0.29.1-1mdv2010.1
+ Revision: 486388
- add some provides on themanaworld and manaworld
-- import tmw \ No newline at end of file
+- import tmw