[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/bsd-games/FC-6 bsd-games-2.17-stdio-c++.patch, NONE, 1.1 bsd-games-2.17-tetris-rename.patch, NONE, 1.1 bsd-games.spec, 1.9, 1.10 config.params, 1.4, 1.5



Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9253

Modified Files:
	bsd-games.spec config.params 
Added Files:
	bsd-games-2.17-stdio-c++.patch 
	bsd-games-2.17-tetris-rename.patch 
Log Message:
Rename tetris to avoid legal quandries
Patch to add extern "C" block to prevent c++ compiler error.



bsd-games-2.17-stdio-c++.patch:

--- NEW FILE bsd-games-2.17-stdio-c++.patch ---
--- include/stdio.h.orig	2007-01-30 15:53:42.000000000 -0800
+++ include/stdio.h	2007-01-30 15:54:17.000000000 -0800
@@ -35,5 +35,11 @@
 #include_next <stdio.h>
 
 #ifndef HAVE_fgetln
+#ifdef __cplusplus
+extern "C" {
+#endif
 extern char *fgetln(FILE *stream, size_t *len);
+#ifdef __cplusplus
+}
+#endif
 #endif

bsd-games-2.17-tetris-rename.patch:

--- NEW FILE bsd-games-2.17-tetris-rename.patch ---
--- tetris/tetris.6.in.orig	2007-04-30 22:07:33.000000000 -0700
+++ tetris/tetris.6.in	2007-04-30 22:12:40.000000000 -0700
@@ -33,11 +33,11 @@
 .\"	@(#)tetris.6	8.1 (Berkeley) 5/31/93
 .\"
 .Dd May 31, 1993
-.Dt TETRIS 6
+.Dt BSD-FBG 6
 .Os
 .Sh NAME
-.Nm tetris
-.Nd the game of tetris
+.Nm bsd-fbg
+.Nd a falling block game
 .Sh SYNOPSIS
 .Nm
 .Op Fl ps
@@ -46,7 +46,7 @@
 .Sh DESCRIPTION
 The
 .Nm
-command runs display-based game which must be played on a CRT terminal.
+command runs a display-based game which must be played on a CRT terminal.
 The object is to fit the shapes together forming complete rows,
 which then vanish.
 When the shapes fill up to the top, the game ends.
@@ -83,7 +83,7 @@
 space or tab characters from the shell.
 For example:
 .sp
-.Dl "tetris -l 2 -k 'jkl pq'"
+.Dl "bsd-fbg -l 2 -k 'jkl pq'"
 .sp
 will play the default games, i.e. level 2 and with the default
 control keys.
--- tetris/scores.c.orig	2007-04-30 22:15:16.000000000 -0700
+++ tetris/scores.c	2007-04-30 22:15:23.000000000 -0700
@@ -367,7 +367,7 @@
 
 	if (!gotscores)
 		getscores(NULL);
-	(void)printf("\n\t\t\t    Tetris High Scores\n");
+	(void)printf("\n\t\t\t    High Scores\n");
 
 	/*
 	 * If level == 0, the person has not played a game but just asked for
--- tetris/tetris.c.orig	2007-04-30 22:16:20.000000000 -0700
+++ tetris/tetris.c	2007-04-30 22:16:37.000000000 -0700
@@ -337,6 +337,6 @@
 void
 usage()
 {
-	(void)fprintf(stderr, "usage: tetris-bsd [-ps] [-k keys] [-l level]\n");
+	(void)fprintf(stderr, "usage: bsd-fbg [-ps] [-k keys] [-l level]\n");
 	exit(1);
 }


Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-6/bsd-games.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bsd-games.spec	23 Nov 2006 00:09:59 -0000	1.9
+++ bsd-games.spec	5 May 2007 22:30:08 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -21,8 +21,10 @@
 # Add patches for man page renames
 Patch8: bsd-games-2.17-monop-rename.patch
 Patch9: bsd-games-2.17-banner-rename.patch
+Patch10: bsd-games-2.17-stdio-c++.patch
+Patch12: bsd-games-2.17-tetris-rename.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ncurses-devel libtermcap-devel words flex bison
+BuildRequires: libtermcap-devel ncurses-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
 
 %description
@@ -30,7 +32,7 @@
 bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku,
 hunt, mille, mpoly, morse, number, phantasia, pig, pom, ppt, primes,
 quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon,
-tetris-bsd, trek, worm, worms and wump.
+bsd-fbg, trek, worm, worms and wump.
 
 %prep
 %setup -q
@@ -45,6 +47,8 @@
 %patch7 -p1 -b .phantasiagid
 %patch8 -p1 -b .monop.rename
 %patch9 -p0 -b .banner.rename
+%patch10 -p0 -b .cplusplus
+%patch12 -p0 -b .tetris.rename
 
 %build
 # We include a templatized configuration settings file to set
@@ -83,6 +87,11 @@
 mv $RPM_BUILD_ROOT/%{_bindir}/banner $RPM_BUILD_ROOT/%{_bindir}/vert-banner
 mv $RPM_BUILD_ROOT/%{_mandir}/man6/banner.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/vert-banner.6.gz
 
+# Change the binary name for tetris to prevent a conflict with the mono-devel
+# package
+mv $RPM_BUILD_ROOT/%{_bindir}/tetris-bsd $RPM_BUILD_ROOT/%{_bindir}/bsd-fbg
+mv $RPM_BUILD_ROOT/%{_mandir}/man6/tetris-bsd.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/bsd-fbg.6.gz
+
 # Remove this doc file.  We're copying it to a different location for Fedora.
 rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me
 
@@ -131,7 +140,7 @@
 %attr(2755,root,gamesail) %{_bindir}/sail
 %attr(2755,root,games) %{_bindir}/snake
 %{_bindir}/snscore
-%attr(2755,root,games) %{_bindir}/tetris-bsd
+%attr(2755,root,games) %{_bindir}/bsd-fbg
 %{_bindir}/trek
 %{_bindir}/vert-banner
 %{_bindir}/worm
@@ -156,10 +165,14 @@
 %config %attr(664,root,gamesail) %{_var}/games/saillog
 %config %attr(664,root,games) %{_var}/games/snake.log
 %config %attr(664,root,games) %{_var}/games/snakerawscores
-%config %attr(664,root,games) %{_var}/games/tetris-bsd.scores
+%config %attr(664,root,games) %{_var}/games/bsd-fbg.scores
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Tue May 1 2007 Wart <wart kobold org> 2.17-17
+- Rename tetris to avoid legal quandries
+- Patch to add extern "C" block to prevent c++ compiler error.
+
 * Wed Nov 22 2006 Wart <wart kobold org> 2.17-16
 - Drop the useless game 'wargames'
 
@@ -259,9 +272,9 @@
 * Mon Nov 1 1999 Tim Powers <timp redhat com>
 - updated source to 2.8
 - fixed problem with ospeed being defined in the source instead of including
-	termcap.h (new ospeed patch)
+        termcap.h (new ospeed patch)
 - using files list in %%files section instead of entering
-	_every_single_filename_.
+        _every_single_filename_.
 
 * Sat Aug 21 1999 Bill Nottingham <notting redhat com>
 - fix countmail (#3722). I must be bored.


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-6/config.params,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- config.params	23 Nov 2006 00:09:59 -0000	1.4
+++ config.params	5 May 2007 22:30:08 -0000	1.5
@@ -17,6 +17,7 @@
 bsd_games_cfg_docdir= docdir@
 bsd_games_cfg_sharedir= datadir@/bsd-games/
 bsd_games_cfg_varlibdir= var@/games/
+bsd_games_cfg_tetris_scorefile= var@/games/bsd-fbg.scores
 # Don't try to chown the files.  This will fail for non-root users and
 # will instead be handled in the rpm packaging.
 bsd_games_cfg_do_chown=n


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]