rpms/bsd-games/FC-5 bsd-games.spec,1.4,1.5 config.params,1.2,1.3

Michael Thomas (wart) fedora-extras-commits at redhat.com
Sun Oct 15 05:35:21 UTC 2006


Author: wart

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

Modified Files:
	bsd-games.spec config.params 
Log Message:
- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-5/bsd-games.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- bsd-games.spec	20 Jun 2006 21:54:34 -0000	1.4
+++ bsd-games.spec	15 Oct 2006 05:35:20 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 11%{?dist}
+Release: 12%{?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-12
+- Reintroduce the 'banner' program as 'vert-banner' (BZ #209018)
+
 * Tue Jun 20 2006 Wart <wart at kobold.org> 2.17-11
 - Added missing BR: flex, bison
 - Rename monop man page to match the renamed executable.


Index: config.params
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-5/config.params,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- config.params	2 May 2006 00:12:02 -0000	1.2
+++ config.params	15 Oct 2006 05:35:20 -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@




More information about the fedora-extras-commits mailing list