From 3477e380121e6f37560002dbf41b90a69e0c618f Mon Sep 17 00:00:00 2001 From: Maarten Vanraes Date: Thu, 26 May 2011 08:32:45 +0200 Subject: modify autoconf files to change spec version and make dist-bzip2 to work well --- Makefile.am | 9 +++-- configure.ac | 2 ++ docs/Makefile.am | 4 +-- manaplus.spec | 101 ------------------------------------------------------- manaplus.spec.in | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 105 deletions(-) delete mode 100644 manaplus.spec create mode 100644 manaplus.spec.in 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 deleted file mode 100644 index 34763e25a..000000000 --- a/manaplus.spec +++ /dev/null @@ -1,101 +0,0 @@ -Name: manaplus -Version: 1.1.4.17 -Release: %mkrel 1 -Summary: A client for Evol Online and The Mana World: 2D MMORPG -Group: Games/Other -License: GPLv2+ -Url: http://manaplus.evolonline.org/ -Source0: http://download.evolonline.org/manaplus/download/%{version}/%{name}-%{version}.tar.bz2 - -BuildRequires: SDL-devel -BuildRequires: SDL_mixer-devel -Buildrequires: SDL_net-devel -BuildRequires: SDL_ttf-devel -BuildRequires: SDL_gfx-devel -BuildRequires: physfs-devel -BuildRequires: curl-devel -BuildRequires: guichan-devel -BuildRequires: libxml2-devel -BuildRequires: libpng-devel -BuildRequires: gettext-devel - -Provides: evolonline-client = %{version}-%{release} -Provides: manaworld-client = %{version}-%{release} - -Suggests: mumble - -%description -ManaPlus is extended client for Evol Online, The Mana World and similar -servers based on eAthena fork. -As a 2D style game, Evol Online aims to create a friendly environment where -people can escape reality and interact with others while enjoying themselves -through a fantasy style game. -The Mana World (TMW) is a serious effort to create an innovative free and -open source MMORPG. TMW uses 2D graphics and aims to create a large and -diverse interactive world. - -%prep -%setup -q -n manaplus - -%build -autoreconf -i -%configure2_5x --bindir=%{_gamesbindir} \ - --datadir=%{_gamesdatadir} \ - --disable-rpath -%make - -%install -rm -rf %{buildroot} -%makeinstall_std - -%find_lang %{name} - -%clean -rm -rf %{buildroot} - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING docs/*.txt NEWS README -%{_gamesbindir}/%{name} -%{_gamesdatadir}/%{name} -%{_datadir}/pixmaps/%{name}.png -%{_datadir}/applications/%{name}.desktop -%{_mandir}/man6/%{name}* - - - - -%changelog -* Sun Apr 17 2011 alien 1.1.4.17-1.mga1 -+ Revision: 87336 -- upgrade to 1.1.4.17 - -* Fri Apr 08 2011 alien 1.1.4.3-1.mga1 -+ Revision: 82020 -- Update to new version 1.1.4.3 -- manaplus is now primarily for Evol Online, updating Summary and Description and add Provides -- suggests mumble - -* Sat Feb 26 2011 alien 1.1.2.20-1.mga1 -+ Revision: 61040 -- Fix BuildRequires -- Fix configure part -- Remove unneeded mv files -- Remove BuildRoot -- use tmw spec file as basis -- imported package manaplus - - -* Sun Jan 31 2010 Jérôme Brenier 0.0.29.1-3mdv2010.1 -+ Revision: 498772 -- add version and release for Provides - -* Tue Jan 05 2010 Jérôme Brenier 0.0.29.1-2mdv2010.1 -+ Revision: 486410 -- use _gamesbindir and _gamesdatadir -- Suggests: tmwmusic - -* Tue Jan 05 2010 Jérôme Brenier 0.0.29.1-1mdv2010.1 -+ Revision: 486388 -- add some provides on themanaworld and manaworld -- import tmw \ No newline at end of file diff --git a/manaplus.spec.in b/manaplus.spec.in new file mode 100644 index 000000000..1e10a19a2 --- /dev/null +++ b/manaplus.spec.in @@ -0,0 +1,100 @@ +Name: manaplus +Version: @PACKAGE_VERSION@ +Release: 1-manaplus +Summary: A client for Evol Online and The Mana World: 2D MMORPG +Group: Games/Other +License: GPLv2+ +Url: http://manaplus.evolonline.org/ +Source0: http://download.evolonline.org/manaplus/download/%{version}/%{name}-%{version}.tar.bz2 + +BuildRequires: SDL-devel +BuildRequires: SDL_mixer-devel +Buildrequires: SDL_net-devel +BuildRequires: SDL_ttf-devel +BuildRequires: SDL_gfx-devel +BuildRequires: physfs-devel +BuildRequires: curl-devel +BuildRequires: guichan-devel +BuildRequires: libxml2-devel +BuildRequires: libpng-devel +BuildRequires: gettext-devel + +Provides: evolonline-client = %{version}-%{release} +Provides: manaworld-client = %{version}-%{release} + +Suggests: mumble + +%description +ManaPlus is extended client for Evol Online, The Mana World and similar +servers based on eAthena fork. +As a 2D style game, Evol Online aims to create a friendly environment where +people can escape reality and interact with others while enjoying themselves +through a fantasy style game. +The Mana World (TMW) is a serious effort to create an innovative free and +open source MMORPG. TMW uses 2D graphics and aims to create a large and +diverse interactive world. + +%prep +%setup -q -n manaplus + +%build +%configure2_5x --bindir=%{_gamesbindir} \ + --datadir=%{_gamesdatadir} \ + --disable-rpath +%make + +%install +rm -rf %{buildroot} +%makeinstall_std + +%find_lang %{name} + +%clean +rm -rf %{buildroot} + +%files -f %{name}.lang +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING docs/*.txt NEWS README +%{_gamesbindir}/%{name} +%{_gamesdatadir}/%{name} +%{_datadir}/pixmaps/%{name}.png +%{_datadir}/applications/%{name}.desktop +%{_mandir}/man6/%{name}* + + + + +%changelog +* Sun Apr 17 2011 alien 1.1.4.17-1.mga1 ++ Revision: 87336 +- upgrade to 1.1.4.17 + +* Fri Apr 08 2011 alien 1.1.4.3-1.mga1 ++ Revision: 82020 +- Update to new version 1.1.4.3 +- manaplus is now primarily for Evol Online, updating Summary and Description and add Provides +- suggests mumble + +* Sat Feb 26 2011 alien 1.1.2.20-1.mga1 ++ Revision: 61040 +- Fix BuildRequires +- Fix configure part +- Remove unneeded mv files +- Remove BuildRoot +- use tmw spec file as basis +- imported package manaplus + + +* Sun Jan 31 2010 Jérôme Brenier 0.0.29.1-3mdv2010.1 ++ Revision: 498772 +- add version and release for Provides + +* Tue Jan 05 2010 Jérôme Brenier 0.0.29.1-2mdv2010.1 ++ Revision: 486410 +- use _gamesbindir and _gamesdatadir +- Suggests: tmwmusic + +* Tue Jan 05 2010 Jérôme Brenier 0.0.29.1-1mdv2010.1 ++ Revision: 486388 +- add some provides on themanaworld and manaworld +- import tmw -- cgit v1.2.3-70-g09d2