rpms/bsd-games/devel bsd-games-2.17-banner-rename.patch, NONE, 1.1 bsd-games.spec, 1.7, 1.8 config.params, 1.2, 1.3

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1701

Modified Files:
	bsd-games.spec config.params 
Added Files:
	bsd-games-2.17-banner-rename.patch 
Log Message:
Add back the 'banner' program as 'vert-banner'



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

--- NEW FILE bsd-games-2.17-banner-rename.patch ---
--- banner/banner.6.orig	2006-10-14 21:24:31.000000000 -0700
+++ banner/banner.6	2006-10-14 21:25:12.000000000 -0700
@@ -30,10 +30,10 @@
 .\"	@(#)banner.6	8.2 (Berkeley) 4/29/95
 .\"
 .Dd April 29, 1995
-.Dt BANNER 6
+.Dt VERT-BANNER 6
 .Os
 .Sh NAME
-.Nm banner
+.Nm vert-banner
 .Nd print large banner on printer
 .Sh SYNOPSIS
 .Nm


Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bsd-games.spec	28 Aug 2006 13:46:53 -0000	1.7
+++ bsd-games.spec	15 Oct 2006 05:17:22 -0000	1.8
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 14%{?dist}
+Release: 15%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -18,8 +18,9 @@
 Patch5: bsd-games-2.17-tetrisgid.patch
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
-# Add patch for monop->mpoly man page
+# Add patches for man page renames
 Patch8: bsd-games-2.17-monop-rename.patch
+Patch9: bsd-games-2.17-banner-rename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libtermcap-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
@@ -43,6 +44,7 @@
 %patch6 -p1 -b .hackgid
 %patch7 -p1 -b .phantasiagid
 %patch8 -p1 -b .monop.rename
+%patch9 -p0 -b .banner.rename
 
 %build
 # We include a templatized configuration settings file to set
@@ -76,6 +78,11 @@
 mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly
 mv $RPM_BUILD_ROOT/%{_mandir}/man6/monop.6.gz $RPM_BUILD_ROOT/%{_mandir}/man6/mpoly.6.gz
 
+# Change the binary name for banner to prevent a conflict with a Fedora
+# package with the same name
+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
+
 # Remove this doc file.  We're copying it to a different location for Fedora.
 rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me
 
@@ -126,6 +133,7 @@
 %{_bindir}/snscore
 %attr(2755,root,games) %{_bindir}/tetris-bsd
 %{_bindir}/trek
+%{_bindir}/vert-banner
 %{_bindir}/wargames
 %{_bindir}/worm
 %{_bindir}/worms
@@ -153,6 +161,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Oct 14 2006 Wart <wart at kobold.org> 2.17-15
+- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
+
 * Mon Aug 28 2006 Wart <wart at kobold.org> 2.17-14
 - Rebuild for Fedora Extras
 


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/config.params,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.params	1 May 2006 23:59:29 -0000	1.2
+++ config.params	15 Oct 2006 05:17:22 -0000	1.3
@@ -7,7 +7,7 @@
 
 bsd_games_cfg_non_interactive=y
 bsd_games_cfg_install_prefix=@DESTDIR@
-bsd_games_cfg_no_build_dirs="banner countmail dm factor fortune"
+bsd_games_cfg_no_build_dirs="countmail dm factor fortune"
 bsd_games_cfg_gamesdir=@bindir@
 bsd_games_cfg_sbindir=@sbindir@
 bsd_games_cfg_libexecdir=@libdir@