From a9d9cfa39ce6ff29f4bc4f469dcfd5b59fc6aabc Mon Sep 17 00:00:00 2001 From: Thorsten Leemhuis Date: Dec 14 2006 19:21:29 +0000 Subject: 1.0-1 -- - Update to 1.0 - drop enigma-gcc41.patch - formating changes - use make install DESTDIR - new download URL --- diff --git a/.cvsignore b/.cvsignore index 21d7ebd..ab03d7e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -enigma-0.92.tar.gz +enigma-1.00.tar.gz diff --git a/enigma-gcc41.patch b/enigma-gcc41.patch deleted file mode 100644 index 568faea..0000000 --- a/enigma-gcc41.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur enigma-0.92/src/file_internal.hh enigma-0.92.new/src/file_internal.hh ---- enigma-0.92/src/file_internal.hh 2004-10-22 19:26:25.000000000 +0200 -+++ enigma-0.92.new/src/file_internal.hh 2006-01-23 08:34:49.000000000 +0100 -@@ -19,7 +19,7 @@ - - class GameFS { - public: -- GameFS::GameFS(); -+ GameFS(); - - void clear() { entries.clear(); } - -diff -ur enigma-0.92/src/stones_simple.cc enigma-0.92.new/src/stones_simple.cc ---- enigma-0.92/src/stones_simple.cc 2005-03-02 21:33:36.000000000 +0100 -+++ enigma-0.92.new/src/stones_simple.cc 2006-01-23 08:39:51.000000000 +0100 -@@ -1672,7 +1672,7 @@ - KillStone(p); - SetItem(p, it_explosion1); - } -- void BombStone::message(const string &msg, const Value &) { -+ void message(const string &msg, const Value &) { - if (msg =="expl" || msg =="bombstone") - change_state(BREAK); - } diff --git a/enigma.spec b/enigma.spec index 2e92029..9aacad2 100644 --- a/enigma.spec +++ b/enigma.spec @@ -1,18 +1,24 @@ Name: enigma -Version: 0.92 -Release: 4%{?dist} +Version: 1.0 +Release: 1%{?dist} Summary: Clone of the ATARI game Oxyd Group: Amusements/Games License: GPL URL: http://www.nongnu.org/enigma/ -Source0: http://savannah.nongnu.org/download/enigma/enigma-0.92.tar.gz -Patch0: enigma-gcc41.patch +Source0: http://download.berlios.de/enigma-game/enigma-1.00.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: SDL-devel >= 1.2 SDL_image-devel >= 1.2 SDL_mixer-devel >= 1.2.4 -BuildRequires: SDL_ttf-devel gettext libpng-devel -BuildRequires: desktop-file-utils zlib-devel >= 1.2.0 tetex >= 2.0.2 +BuildRequires: SDL-devel >= 1.2 +BuildRequires: SDL_image-devel >= 1.2 +BuildRequires: SDL_mixer-devel >= 1.2.4 +BuildRequires: SDL_ttf-devel >= 2.0.4 +BuildRequires: gettext +BuildRequires: libpng-devel +BuildRequires: desktop-file-utils +BuildRequires: zlib-devel >= 1.2.0 +BuildRequires: tetex >= 2.0.2 +BuildRequires: xerces-c-devel %description Enigma is a tribute to and a re-implementation of one of the most @@ -23,17 +29,17 @@ weren't for hidden traps, vast mazes, insurmountable obstacles and innumerable puzzles blocking your direct way to the Oxyd stones... %prep -%setup -q -%patch0 -p1 +%setup -q -n enigma-1.00 %build %configure --enable-optimize make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT -%makeinstall pngdir=${RPM_BUILD_ROOT}/%{_docdir}/enigma-%{version}/html/images htmldir=${RPM_BUILD_ROOT}/%{_docdir}/enigma-%{version}/html/ docdir=${RPM_BUILD_ROOT}/%{_docdir}/enigma-%{version}/html/reference -mv $RPM_BUILD_ROOT/%{_docdir}/%{name}-%{version}/html . +rm -rf $RPM_BUILD_ROOT __doc +make install DESTDIR=$RPM_BUILD_ROOT +mkdir __doc +mv $RPM_BUILD_ROOT%{_datadir}/doc/enigma/ __doc desktop-file-install \ --delete-original \ @@ -56,15 +62,25 @@ gtk-update-icon-cache -qf %{_datadir}/icons/hicolor 2>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) -%doc README AUTHORS ChangeLog COPYING NEWS doc/TODO html/ +%doc README AUTHORS CHANGES COPYING ACKNOWLEDGEMENTS __doc/* %{_datadir}/enigma %{_bindir}/enigma %{_mandir}/man?/enigma.* %{_datadir}/icons/hicolor/48x48/apps/enigma.png %{_datadir}/pixmaps/enigma.png %{_datadir}/applications/*enigma.desktop +# we don't need the enet stuff +%exclude %{_includedir}/enet/ +%exclude %{_libdir}/libenet.a %changelog +* Thu Dec 14 2006 Thorsten Leemhuis - 1.0-1 +- Update to 1.0 +- drop enigma-gcc41.patch +- formating changes +- use make install DESTDIR +- new download URL + * Mon Aug 28 2006 Thorsten Leemhuis - 0.92-4 - Rebuild for Fedora Extras 6 diff --git a/sources b/sources index c26b15b..d77f989 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b33d8fad75910c9a525f4382f5185f75 enigma-0.92.tar.gz +428a9cce666cd45812e785f00a483ef9 enigma-1.00.tar.gz