- new version

- qt support
- spoilers (in separate package)

Changed files:
    nethack.spec -> 1.13

diff --git a/nethack.spec b/nethack.spec
index d1c64d3828ade4a6826eb39a748c9857300e08f6..27252904e6467336676d886530c73f26446ab613 100644 (file)
--- a/nethack.spec
+++ b/nethack.spec
@@ -1,57 +1,68 @@
+%define file_version 331
 Summary:       NetHack - An adventure into the Mazes of Menace
 Summary(no):   NetHack - Et eventyr i en faretruende labyrint
 Summary(pl):   NetHack - Przygoda w Labiryntach Gro¼by 
 Name:          nethack
-Version:       3.2.2
-Release:       8
+Version:       3.3.1
+Release:       1
 Group:         Applications/Games
 Group(de):     Applikationen/Spiele
 Group(pl):     Aplikacje/Gry
 License:       GPL
-Source0:       ftp://prep.ai.mit.edu/pub/gnu/%{name}-%{version}.tar.gz
+Source0:       ftp://ftp.nethack.org/pub/nethack/nh331/src/%{name}-%{file_version}.tgz
+Source1:       http://www.spod-central.org/~psmith/nh/spoi-%{file_version}.tar.gz
+Source2:       http://www.spod-central.org/~psmith/nh/gazetteer.tar.gz
 Patch0:                %{name}-pld.patch
-Patch1:                %{name}-makefile.patch
-Icon:          rougelike.gif
-URL:           http://www.win.tue.nl/games/roguelike/nethack/
-Prereq:                /usr/X11R6/bin/mkfontdir
+Icon:          roguelike.gif
+URL:           http://www.nethack.org/
 BuildRequires: bison
 BuildRequires: XFree86-devel
 BuildRequires: ncurses-devel
+BuildRequires: qt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-NetHack 3.2.2 -- An adventure into the Mazes of Menace.
+NetHack - An adventure into the Mazes of Menace.
 
-NetHack 3.2.2 is a new enhancement to the dungeon exploration game
+NetHack 3.3.1 is a new enhancement to the dungeon exploration game
 NetHack. It is a distant descendent of Rogue and Hack, and a direct
 descendent of NetHack 3.1 and 3.0.
 
-Compiled with: X11 support, glibc 2.1 and ncurses.
+Compiled with: QT and ncurses support.
 
 %description -l no
-NetHack 3.2.2 -- Et eventyr i en faretruende labyrint.
+NetHack 3.3.1 -- Et eventyr i en faretruende labyrint.
 
-NetHack 3.2.2 er siste utvidelse til NetHack, et tøm og røm eventyr
+NetHack 3.3.1 er siste utvidelse til NetHack, et tøm og røm eventyr
 spill. Det er basert på spill som Rouge og Hack, og er etterfølgeren
 til versjon 3.0 og 3.1 av NetHack.
 
-Denne utgaven er kopilert støtte for følgende utvidelser: X11, glibc
-2.1 og ncurses.
+Denne utgaven er kopilert støtte for følgende utvidelser: QT og
+ncurses.
 
 %description -l pl
-NetHack 3.2.2 -- Przygoda w Labiryntach Gro¼by.
+NetHack 3.3.1 -- Przygoda w Labiryntach Gro¼by.
 
-NetHack 3.2.2 jest przygodow± gr±, której akcja toczy siê w
+NetHack 3.3.1 jest przygodow± gr±, której akcja toczy siê w
 podziemnych labiryntach. Wywodzi siê ze starszych gier, Rouge i Hack,
 i zawiera wiele nowych rozszerzeñ w stosunku do poprzednich wersji 3.0
 i 3.1.
 
-Kompilowany ze wsparciem dla X11, glibc 2.1 i ncurses.
+Kompilowany ze wsparciem dla QT i ncurses.
+
+%package spoilers
+Summary:       Spoilers to NetHack.
+Group:         Applications/Games
+Group(de):     Applikationen/Spiele
+Group(pl):     Aplikacje/Gry
+
+%description spoilers
+Spoilers - a set of texts which explain many secrets in the game.
+Beware: the game after reading it becomes even more addictive!!!
 
 %prep
-%setup -q
+%setup -q -a 1 -a 2
 %patch0 -p1
-%patch1 -p1
 
 %build
 ./sys/unix/setup.sh links
@@ -62,9 +73,6 @@ Kompilowany ze wsparciem dla X11, glibc 2.1 i ncurses.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/{games/nethack,fonts/misc} \
-$RPM_BUILD_ROOT{%{_mandir}/man6,%{_prefix}/X11R6/lib/X11/app-defaults} \
-       $RPM_BUILD_ROOT/var/games/nethack
 
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
@@ -73,41 +81,26 @@ $RPM_BUILD_ROOT{%{_mandir}/man6,%{_prefix}/X11R6/lib/X11/app-defaults} \
 install util/recover   $RPM_BUILD_ROOT%{_datadir}/games/nethack
 install util/*_comp    $RPM_BUILD_ROOT%{_datadir}/games/nethack
 
-install win/X11/NetHack.ad \
-$RPM_BUILD_ROOT%{_prefix}/X11R6/lib/X11/app-defaults/NetHack
+gzip -9nf doc/Guidebook.txt doc/Guidebook README doc/window.doc 
 
-(cd win/X11 ;
-%{_prefix}/X11R6/bin/bdftopcf < nh10.bdf > nh10.pcf
-%{_prefix}/X11R6/bin/bdftopcf < ibm.bdf > ibm.pcf
-install nh10.pcf ibm.pcf $RPM_BUILD_ROOT%{_datadir}/fonts/misc
-)
-
-gzip -9nf $RPM_BUILD_ROOT%{_datadir}/fonts/misc/*.pcf \
-       doc/Guidebook* doc/tmac.n README doc/window.doc 
-
-%post
-/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
-
-%postun
-/usr/X11R6/bin/mkfontdir /usr/share/fonts/misc
+gzip -9nf nhspoilers/README nhspoilers/*.txt nhspoilers/gazetteer/README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc doc/{Guidebook*,tmac.n,Guidebook,window.doc}.gz 
-%doc win/X11/nethack.rc README.gz
-%attr(0755,root,root) %{_prefix}/games/nethack
-%attr(2755,root,games) %{_datadir}/games/nethack/nethack
-%attr(2755,root,games) %{_datadir}/games/nethack/recover
-%attr(0755,root,root) %{_datadir}/games/nethack/*_comp
-
-%attr(755,root,root) %dir %{_datadir}/games/nethack
-%{_datadir}/games/nethack/nhdat
-%{_datadir}/games/nethack/license
-%{_datadir}/games/nethack/*.xpm
-%{_datadir}/games/nethack/x11tiles
+%doc README.gz doc/{Guidebook.txt,Guidebook,window.doc}.gz 
+%attr(2750,root,games) %{_prefix}/games/nethack
+%attr(2750,root,games) %{_datadir}/games/nethack/nethack
+%attr(2750,root,games) %{_datadir}/games/nethack/recover
+%attr(2750,root,games) %{_datadir}/games/nethack/*_comp
+
+%attr(2770,root,games) %dir %{_datadir}/games/nethack
+%attr(640,root,games) %{_datadir}/games/nethack/nhdat
+%attr(640,root,games) %{_datadir}/games/nethack/license
+%attr(640,root,games) %{_datadir}/games/nethack/*.xpm
+%attr(640,root,games) %{_datadir}/games/nethack/x11tiles
 
 %attr(775,root,games) %dir /var/games/nethack
 %attr(775,root,games) %dir /var/games/nethack/save
@@ -115,7 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(664,root,games) /var/games/nethack/record
 %attr(664,root,games) /var/games/nethack/logfile
 
-%{_datadir}/fonts/misc/*.pcf.gz
 %{_mandir}/man6/*
 
-%config %{_prefix}/X11R6/lib/X11/app-defaults/NetHack
+%files spoilers
+%defattr(644,root,root,755)
+%doc nhspoilers/README.gz nhspoilers/*.txt.gz
+%doc %dir nhspoilers/gazetteer