diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..11a1fff --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +adonthell-src-0.3.5.tar.gz diff --git a/adonthell-0.3.5-fix-build-with-gcc-4.4.patch b/adonthell-0.3.5-fix-build-with-gcc-4.4.patch new file mode 100644 index 0000000..7441d5c --- /dev/null +++ b/adonthell-0.3.5-fix-build-with-gcc-4.4.patch @@ -0,0 +1,34 @@ +Index: adonthell-0.3/src/dialog.cc +=================================================================== +RCS file: /sources/adonthell/adonthell-0.3/src/dialog.cc,v +retrieving revision 1.36 +retrieving revision 1.37 +diff -u -r1.36 -r1.37 +--- adonthell-0.3/src/dialog.cc 13 Oct 2007 19:47:25 -0000 1.36 ++++ adonthell-0.3/src/dialog.cc 1 Mar 2009 12:26:14 -0000 1.37 +@@ -1,5 +1,5 @@ + /* +- $Id: dialog.cc,v 1.36 2007/10/13 19:47:25 ksterker Exp $ ++ $Id: dialog.cc,v 1.37 2009/03/01 12:26:14 ksterker Exp $ + + (C) Copyright 2000/2001/2002 Kai Sterker + Part of the Adonthell Project http://adonthell.linuxgames.com +@@ -265,7 +265,8 @@ + { + u_int32 begin, end, len; + PyObject *result; +- char *tmp, *start, *mid, *str = NULL; ++ const char *start; ++ char *tmp, *mid, *str = NULL; + character *the_player = data::the_player; + string newstr (s); + +@@ -318,7 +319,7 @@ + + // Error! + cout << "\n*** Error, unknown macro " << start << flush; +- start[0] = ' '; ++ newstr[newstr.length () - strlen (start)] = ' '; + } + + // execute python functions diff --git a/adonthell-0.3.5-fix-build-with-gcc-4.6.patch b/adonthell-0.3.5-fix-build-with-gcc-4.6.patch new file mode 100644 index 0000000..1801b8f --- /dev/null +++ b/adonthell-0.3.5-fix-build-with-gcc-4.6.patch @@ -0,0 +1,26 @@ +Index: adonthell-0.3/src/win_event.cc +=================================================================== +RCS file: /sources/adonthell/adonthell-0.3/src/win_event.cc,v +retrieving revision 1.5 +retrieving revision 1.6 +diff -u -r1.5 -r1.6 +--- adonthell-0.3/src/win_event.cc 16 Dec 2002 19:09:54 -0000 1.5 ++++ adonthell-0.3/src/win_event.cc 11 Feb 2011 20:50:27 -0000 1.6 +@@ -1,5 +1,5 @@ + /* +- $Id: win_event.cc,v 1.5 2002/12/16 19:09:54 ksterker Exp $ ++ $Id: win_event.cc,v 1.6 2011/02/11 20:50:27 ksterker Exp $ + + (C) Copyright 2001 Joel Vennin + Part of the Adonthell Project http://adonthell.linuxgames.com +@@ -34,8 +34,9 @@ + + case DESTROY: + { ++ Functor0wRet func0ret; + set_callback_destroy ( +- makeFunctor (&Functor0wRet(), *callback, &py_callback::callback_func0ret)); ++ makeFunctor (&func0ret, *callback, &py_callback::callback_func0ret)); + break; + } + diff --git a/adonthell.spec b/adonthell.spec new file mode 100644 index 0000000..d3427bb --- /dev/null +++ b/adonthell.spec @@ -0,0 +1,173 @@ +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + +Name: adonthell +Version: 0.3.5 +Release: 0.16%{?dist} +Summary: A 2D graphical RPG game + +Group: Amusements/Games +License: GPLv2+ +URL: http://adonthell.linuxgames.com/ +Source0: http://savannah.nongnu.org/download/%{name}/%{name}-src-%{version}.tar.gz + +## Fixes from CVS, no new release yet. +# Patch was obtained with: +# cvs diff -u -r 1.36 -r 1.37 adonthell-0.3/src/dialog.cc +Patch0: %{name}-0.3.5-fix-build-with-gcc-4.4.patch +# Patch was obtained with: +# cvs diff -u -r 1.5 -r 1.6 adonthell-0.3/src/win_event.cc +Patch1: %{name}-0.3.5-fix-build-with-gcc-4.6.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: python-devel +BuildRequires: freetype-devel +BuildRequires: libxml2-devel +BuildRequires: libogg-devel +BuildRequires: libvorbis-devel +BuildRequires: SDL_mixer-devel +BuildRequires: SDL_ttf-devel +BuildRequires: libpng-devel +BuildRequires: swig +BuildRequires: doxygen +BuildRequires: graphviz + + +%description +A 2D, graphical, single player role playing game inspired by good old +console RPGs from the 16 bit console gaming era. + +This package contains the Adonthell engine. You will also need a game +package to play Adonthell. For this release, the official package is +Waste's Edge. + + +%package doc +Summary: API documentation for %{name} + +Group: Documentation +Requires: %{name} = %{version}-%{release} + +%description doc +API documentation for %{name} generated by doxygen in HTML format. + + +%prep +%setup -q +# install locale files in the right place +sed -i 's|myconfig.gamedir + "/locale"|"%{_datadir}/locale"|' src/nls.cc +# remove hardcoded CFLAGS +sed -i 's|^CFLAGS|^#CFLAGS|g' configure +# build with GCC 4.4 +%patch0 -p1 +%patch1 -p1 + + +%build +%configure --enable-doc +make %{?_smp_mflags} + + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc AUTHORS COPYING FULLSCREEN.howto NEWBIE NEWS README +%{_bindir}/%{name} +%{_bindir}/%{name}-0.3 +%{_datadir}/%{name}/ + +%files doc +%defattr(-,root,root,-) +%doc doc/devel/html + + +%changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.3.5-0.16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.3.5-0.15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 0.3.5-0.14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Feb 28 2012 Fedora Release Engineering - 0.3.5-0.13 +- Rebuilt for c++ ABI breakage + +* Thu Jan 12 2012 Fedora Release Engineering - 0.3.5-0.12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 15 2011 Mathieu Bridon - 0.3.5-0.11 +- Fix GCC-4.6 build failure +- Remake GCC-4.4 build failure patch from 0.3.5-0.6: + - use cvs to generate a proper patch + - name it properly + +* Mon Feb 07 2011 Fedora Release Engineering - 0.3.5-0.10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jul 27 2010 David Malcolm - 0.3.5-0.9 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + +* Tue Aug 11 2009 Mathieu Bridon - 0.3.5-0.8 +- Upstream changed source URL. +- Added defattr for -doc subpackage. + +* Fri Jul 24 2009 Fedora Release Engineering - 0.3.5-0.7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Sun Mar 01 2009 Mathieu Bridon - 0.3.5-0.6 +- Fixed building with GCC 4.4 + +* Mon Feb 23 2009 Fedora Release Engineering - 0.3.5-0.5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Nov 30 2008 Ignacio Vazquez-Abrams - 0.3.5-0.4 +- Rebuild for Python 2.6 + +* Tue Jun 03 2008 Mathieu Bridon 0.3.5-0.3 +- added -p option to install + +* Sat May 31 2008 Mathieu Bridon 0.3.5-0.2 +- applied patch to configure instead of configure.in +- removed trademarks names from description +- removed explicit requires + +* Tue May 27 2008 Mathieu Bridon 0.3.5-0.1 +- switched to 0.3.5 release (includes bug fixes and fixes for building RPM for + fedora like pythin finding and errors with fedora specific flags) + +* Fri May 22 2008 Mathieu Bridon 0.3.4-0.8 +- fixed license tag (GPLv2 to GPLv2+) +- removed explicit requires +- fixed directories ownership + +* Thu Apr 17 2008 Mathieu Bridon 0.3.4-0.7 +- fixed building on 64 bits arch (/lib was hard coded in configure.in) + +* Fri Apr 04 2008 Mathieu Bridon 0.3.4-0.6 +- fixed typo in doc description + +* Fri Feb 22 2008 Mathieu Bridon 0.3.4-0.5 +- search for translations in the right place so that wastesedge +package can install them in the right place + +* Thu Feb 21 2008 Mathieu Bridon 0.3.4-0.4 +- separated the doc in a dedicated package + +* Thu Feb 21 2008 Mathieu Bridon 0.3.4-0.3 +- cleaned the spec file again + +* Thu Feb 21 2008 Mathieu Bridon 0.3.4-0.2 +- cleaned the spec file + +* Mon Feb 18 2008 Mathieu Bridon 0.3.4-0.1 +- first version of the SPEC file diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..715f6cc --- /dev/null +++ b/sources @@ -0,0 +1 @@ +64a344b1ed8a7808d7adafa337120a00 adonthell-src-0.3.5.tar.gz