SPECS: nethack.spec - cleanup - cut changelog

wolf wolf at pld-linux.org
Tue Aug 9 23:56:03 CEST 2005


Author: wolf                         Date: Tue Aug  9 21:56:03 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanup
- cut changelog

---- Files affected:
SPECS:
   nethack.spec (1.68 -> 1.69) 

---- Diffs:

================================================================
Index: SPECS/nethack.spec
diff -u SPECS/nethack.spec:1.68 SPECS/nethack.spec:1.69
--- SPECS/nethack.spec:1.68	Tue Aug  9 23:11:43 2005
+++ SPECS/nethack.spec	Tue Aug  9 23:55:58 2005
@@ -2,14 +2,10 @@
 #
 # Conditional build:
 %bcond_without	qt	# no X11 and Qt bloat 
-%bcond_with	vanilla	# build vanilla NetHack (without patches)
 #
 # --define 'wizard other_username', default is root
 %define		_wizard		%{?wizard:%{wizard}}%{!?wizard:"root"}
 #
-# no patches for now, wait for updates
-%define		with_vanilla	1
-#
 %define		file_version	%(echo %{version} | tr -d .)
 Summary:	NetHack - An adventure into the Mazes of Menace
 Summary(es):	Juego estilo rogue que se basa en Dungeons and Dragons (calabozos y dragones)
@@ -25,7 +21,6 @@
 # Source0-md5:	21479c95990eefe7650df582426457f9
 Source1:	http://www.spod-central.org/~psmith/nh/spoi-%{file_version}.tar.gz
 # Source1-md5:	72cac599c3660eac0a54b17ece8989ff
-#Source1:	http://www.spod-central.org/~psmith/nh/spoi-340.tar.gz
 Source2:	http://www.spod-central.org/~psmith/nh/gazetteer.tar.gz
 # Source2-md5:	651997ab54552b5e9a586cef46bcc50a
 Source3:	%{name}.desktop
@@ -42,28 +37,6 @@
 Patch2:		%{name}-gcc3.patch
 Patch3:		%{name}-qt.patch
 Patch4:		%{name}-qt33.patch
-# patches below are adapted from ones found at http://avrc.city.ac.uk/nethack/patches.html
-# warning: order is important in most cases
-Patch100:	%{name}-show_born.patch
-Patch101:	%{name}-dump.patch
-Patch102:	%{name}-behind_boulder.patch
-Patch103:	%{name}-yafm-monabil.patch
-Patch104:	%{name}-chivalry.patch
-Patch105:	%{name}-kenny.patch
-Patch106:	%{name}-sticky_objects.patch
-Patch107:	%{name}-steed-fix.patch
-Patch108:	%{name}-wash_hands.patch
-Patch109:	%{name}-listmons.patch
-Patch110:	%{name}-flipcoin.patch
-Patch111:	%{name}-ride_key.patch
-Patch112:	%{name}-dungeon_growth.patch
-Patch113:	%{name}-dragon_hoard.patch
-Patch114:	%{name}-torch.patch
-Patch115:	%{name}-hole.patch
-Patch116:	%{name}-mirror.patch
-Patch117:	%{name}-newt.patch
-# after adding additional features update this patch
-Patch200:	%{name}-makedefs.patch
 URL:		http://www.nethack.org/
 %{?with_qt:BuildRequires:	XFree86-devel}
 BuildRequires:	bison
@@ -87,8 +60,6 @@
 maintenance was taken over by a group of hackers originally organized
 by Mike Stephenson.
 
-%{!?with_vanilla:This package contains additional features.}
-
 %description -l pt_BR
 Nethack é um jogo clássico estilo rogue, baseado no Dungeons and
 Dragons. Ele é um jogo muito elaborado e profundo, desenvolvido há
@@ -119,8 +90,6 @@
 'hack' (rąbać, siekać.) Nazwa zmieniła się gdy opieka nad grą została
 przejęta przez grupę hackerów zawiązaną przez Mike'a Stephensona.
 
-%{!?with_vanilla:Ten pakiet zawiera dodatkowe bajery.}
-
 %package spoilers
 Summary:	Spoilers to NetHack
 Summary(pl):	Psuje dla NetHacka
@@ -155,27 +124,6 @@
 %{?with_qt:%patch3 -p1}
 %patch4 -p1
 
-# patches adding fun
-%{!?with_vanilla:%patch100 -p1}
-%{!?with_vanilla:%patch101 -p1}
-%{!?with_vanilla:%patch102 -p1}
-%{!?with_vanilla:%patch103 -p1}
-%{!?with_vanilla:%patch104 -p1}
-%{!?with_vanilla:%patch105 -p1}
-%{!?with_vanilla:%patch106 -p1}
-%{!?with_vanilla:%patch107 -p1}
-%{!?with_vanilla:%patch108 -p1}
-%{!?with_vanilla:%patch109 -p1}
-%{!?with_vanilla:%patch110 -p1}
-%{!?with_vanilla:%patch111 -p1}
-%{!?with_vanilla:%patch112 -p1}
-%{!?with_vanilla:%patch113 -p1}
-#%%{!?with_vanilla:%patch114 -p1}
-#%%{!?with_vanilla:%patch115 -p1}
-#%%{!?with_vanilla:%patch116 -p1}
-%{!?with_vanilla:%patch117 -p1}
-%{!?with_vanilla:%patch200 -p1}
-
 %build
 sh ./sys/unix/setup.sh links
 
@@ -253,6 +201,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.69  2005/08/09 21:55:58  wolf
+- cleanup
+- cut changelog
+
 Revision 1.68  2005/08/09 21:11:43  radek
 - release 3: enable wizard mode
 
@@ -261,261 +213,3 @@
 
 Revision 1.66  2005/05/15 20:06:57  adamg
 - release 2 for Th
-
-Revision 1.65  2004/11/10 22:24:01  ankry
-- rel. 1
-
-Revision 1.64  2004/11/10 21:25:18  ankry
-- started update to 3.4.3
-
-Revision 1.63  2004/11/05 14:30:27  paladine
-- rel 3 for fixed desktop file
-
-Revision 1.62  2004/10/24 22:49:22  paladine
-- QT->Qt
-- spelling fixes
-
-Revision 1.61  2004/04/02 20:39:03  qboosh
-- added qt33 patch (fixes build)
-
-Revision 1.60  2004/03/14 10:47:03  eothane
-- silly changelog cleanups and bcond style changes
-
-Revision 1.59  2004/02/16 17:27:48  qboosh
-- next part of locale names update for glibc 2.3.3: s/no/nb/ in rpm headers
-
-Revision 1.58  2003/12/09 19:59:26  grzegol
-- _applnkdir -> _desktopdir; rel. 2
-
-Revision 1.57  2003/10/07 11:29:18  qboosh
-- simplified %%setup
-
-Revision 1.56  2003/09/25 22:48:11  gotar
-- Conflicts: applnk < 1.5.13
-
-Revision 1.55  2003/09/25 18:14:50  gotar
-- do not require applnk, programs _using_ %{_applnk}/* do require it.
-
-Revision 1.54  2003/09/09 10:24:23  ankry
-- spaces -> tab
-
-Revision 1.53  2003/05/28 12:59:51  malekith
-- massive attack: source-md5
-
-Revision 1.52  2003/05/25 05:51:06  misi3k
-- massive attack s/pld.org.pl/pld-linux.org/
-
-Revision 1.51  2003/03/03 00:52:53  wolf
-- allow building without qt and x11
-
-Revision 1.50  2003/02/28 10:08:03  trojan
-- massive attack: perl -pi -e "s/^#+\%\{/#\%\%\{/"
-
-Revision 1.49  2003/02/25 21:09:04  wolf
-- 3.4.1
-- no new spoilers yet
-- only vanilla for now
-
-Revision 1.48  2002/11/06 11:11:39  ankry
-- moved desktop (from Games/Roguelike to Games/RPG), rel. 11
-
-Revision 1.47  2002/09/13 12:22:10  wolf
-- "chodzi o wymuszenie jednorodnego środowiska budowania. Tak powinno być."
-
-Revision 1.46  2002/09/13 11:54:28  wolf
-- removed lies
-
-Revision 1.45  2002/09/07 07:38:41  blues
-- release 10 - rebuild with qt3 - STBR
-
-Revision 1.44  2002/08/25 22:00:04  wolf
-- argh! these patches break tiles
-- rel 9
-
-Revision 1.43  2002/08/24 20:27:07  wolf
-- new patches
-- rel 8
-
-Revision 1.42  2002/06/19 21:09:05  wolf
-- corrected prev entry in changelog
-- dragon hoard patch
-- release 7
-
-Revision 1.41  2002/06/19 13:33:56  ankry
-- renamed Source8, STBR
-
-Revision 1.40  2002/06/18 21:20:58  kloczek
-- release 6.
-
-Revision 1.39  2002/06/18 13:50:18  wolf
-- newtoys patch
-- monsters spoiler
-
-Revision 1.38  2002/06/12 17:55:59  wolf
-- new doc
-- proper cxx
-- dump patch no longer creates files like '???U at tX}@ŕĹ,?Źř˙ż41????(?wolf.dump'
-- release 5
-
-Revision 1.37  2002/04/16 09:55:19  wolf
-- release 4, STBR
-- regenerated Guidebook.pdf, so it contains changes made by patches
-
-Revision 1.36  2002/04/15 09:45:30  wolf
-- ability to build vanilla flawor
-
-Revision 1.35  2002/04/13 17:10:31  wolf
-- release 3
-- another bunch of patches
-- todo: regenerate pdf guidebook (i don't have tex installed now, nor i have
-  rpms)
-
-Revision 1.34  2002/04/12 09:26:18  wolf
-- first wave of patches
-
-Revision 1.33  2002/04/11 10:20:53  wolf
-- strange, there's no doc/lists, but i had it...
-STBR now
-
-Revision 1.32  2002/04/10 13:41:54  kloczek
-- release 2.
-
-Revision 1.31  2002/04/10 12:24:42  misiek
-- run setup.sh via sh
-
-Revision 1.30  2002/03/31 12:00:21  wolf
-- added pdf guidebook
-- spoiler -> psuj in pl desc
-
-Revision 1.29  2002/03/28 13:44:53  wolf
-- oh yeah, effects of influenza
-- STBR
-
-Revision 1.28  2002/03/27 13:54:48  wolf
-- updated to 3.4.0
-- 90k abracadabra patches are out
-- patchhack: is there new version?
-
-Revision 1.27  2002/03/18 13:18:22  wolf
-- release 7
-- req gzip
-- new icon
-
-Revision 1.26  2002/03/12 13:41:59  depesz
-- patchhack works.
-
-Revision 1.25  2002/03/09 16:53:46  mmazur
-- added flex to BuildReq
-
-Revision 1.24  2002/03/09 16:10:25  depesz
-- typo
-
-Revision 1.23  2002/03/09 16:08:14  depesz
-- make %%files depend on _with_patchhack
-
-Revision 1.22  2002/03/09 10:56:52  depesz
-- added option (--with patchhack) to incorporate patchhack patches
-
-Revision 1.21  2002/03/02 05:55:27  kloczek
-- release 3.
-
-Revision 1.20  2002/02/26 13:53:00  wolf
-- extended description (based on jargon file)
-- macro for version -> filename translation
-
-Revision 1.19  2002/02/23 04:05:39  kloczek
-- adapterized.
-
-Revision 1.18  2002/02/22 23:29:19  kloczek
-- removed all Group fields translations (our rpm now can handle translating
-  Group field using gettext).
-
-Revision 1.17  2002/02/12 11:43:50  kloczek
-- merged translations from Conectiva,
-- spaec adapterized and few cosmetics.
-
-Revision 1.16  2002/02/02 15:37:51  wolf
-- release 2, STBR
-- added icon, desktop file
-- moved license to docs
-- changed permissions from 2750 to 2755 -- files that should be accessible
-  only by game (scores, bones, etc.) were writable for users in games group.
-  No users should be in games group!
-- removed dgn_comp and lev_comp from package -- they are used in building game
-- Guidebook and Guidebook.txt had the same content
-- added polish guidebook (by GSN AFAIR)
-- recover does not seem to work
-- moved sgid from _nhdir to _dyndir{,save}
-- do not replace, remove, verify logfile and scores
-
-Revision 1.15  2002/01/18 02:14:01  kloczek
-- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
-
-Revision 1.14  2001/12/31 08:54:27  qboosh
-- -spoilers pl description
-
-Revision 1.13  2001/12/30 15:15:11  depesz
-- new version
-- qt support
-- spoilers (in separate package)
-
-Revision 1.12  2001/05/02 16:29:09  qboosh
-- adapterized and made spec %%debug ready or added using %%rpm*flags macros
-
-Revision 1.11  2000/11/12 16:58:51  kloczek
-- removed xpm-devel from BuildRequires.
-
-Revision 1.10  2000/08/27 18:15:02  kloczek
-- release 8,
-- added bison to BuildRequires.
-
-Revision 1.9  2000/08/26 18:08:29  kloczek
-- release 7,
-- added Prereq: /usr/X11R6/bin/mkfontdir.
-
-Revision 1.8  2000/07/13 23:17:08  baggins
-- release 6
-- rebuild with ncurses 5.1
-
-Revision 1.7  2000/06/09 07:23:26  kloczek
-- added using %%{__make} macro.
-
-Revision 1.6  2000/06/07 04:11:30  kloczek
-- spec adapterized.
-
-Revision 1.5  2000/04/01 11:15:02  zagrodzki
-- changed all BuildRoot definitons
-- removed all applnkdir defs
-- changed some prereqs/requires
-- removed duplicate empty lines
-
-Revision 1.4  2000/03/28 16:54:42  baggins
-- translated kloczkish into english
-
-Revision 1.3  1999/09/07 22:54:22  pius
-- s/BuildPrereq/BuildRequires/g
-
-Revision 1.2  1999/07/26 15:21:30  pius
-- added using CVS keywords.
-
-* Mon Jul 26 1999 Piotr Czerwiński <pius at pld.org.pl>
-  [3.2.2-5]
-- modified package for PLD use,
-- removed all patches and added new ones,
-- compiled with ncurses 4.2 and glibc 2.1,
-- fixed color support when building with ncurses (thanks to Richard Braakman),
-- fixed glibc 2.1 prototypes checking (by Harmut Koptein),
-- graphic chars are now properly displayed,
-- all dynamic stuff moved to /var/games/nethack (fhs 2.0 compliant),
-- added using DESTDIR (nethack-makefile.patch),
-- fixed permissions on all files,
-- sgid games instead of suid games,
-- added no,pl translation,
-- other less important changes.
-
-* Thu Apr 08 1999 Michael Maher <mike at redhat.com>
-- I doubt this will ever be updated.
-- recompiled for 6.0
-
-* Wed Aug 13 1998 Michael Maher <mike at redhat.com>
-- Built package
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nethack.spec?r1=1.68&r2=1.69&f=u




More information about the pld-cvs-commit mailing list