SPECS: bsd-games.spec - dropped config patch, use configure in non...

[qboosh]

Author: qboosh                       Date: Sat Dec  9 23:59:45 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- dropped config patch, use configure in non-interactive mode instead
- updated monop_rename patch
- added debian patch with various fixes from debian patch (2.17-8), including
  some overfow fixes
- builds now

---- Files affected:
SPECS:
   bsd-games.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: SPECS/bsd-games.spec
diff -u SPECS/bsd-games.spec:1.54 SPECS/bsd-games.spec:1.55
--- SPECS/bsd-games.spec:1.54	Thu Mar 30 14:21:20 2006
+++ SPECS/bsd-games.spec	Sun Dec 10 00:59:39 2006
@@ -1,6 +1,5 @@
 # $Revision$, $Date$
 # TODO
-# - update to 2.17
 # - apply debian patches? ftp://ftp.debian.org/debian/pool/main/b/bsdgames/bsdgames_2.17-5.diff.gz
 Summary:	A collection of BSD (Berkeley Standard Distribution) games
 Summary(de):	Diverse BSD-Games
@@ -21,15 +20,16 @@
 Patch0:		%{name}-hole.patch
 Patch1:		%{name}-headers.patch
 Patch2:		%{name}-ospeed.patch
-Patch3:		%{name}-config.patch
-Patch4:		%{name}-from.patch
-Patch5:		%{name}-monop_rename.patch
-Patch6:		%{name}-man.patch
-Patch7:		%{name}-types.patch
-Patch8:		%{name}-tetris.patch
+Patch3:		%{name}-from.patch
+Patch4:		%{name}-monop_rename.patch
+Patch5:		%{name}-man.patch
+Patch6:		%{name}-types.patch
+Patch7:		%{name}-tetris.patch
+Patch8:		%{name}-debian.patch
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	groff
+BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel >= 5.0
 BuildRequires:	words
 Requires:	textutils
@@ -88,28 +88,28 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-# config patch creation: diff between unconfigured and following configuration:
-# Install prefix: $INSTALL_PREFIX
-# Games not to build: banner factor fortune hack
-# Games directory: /usr/bin
-# Daemon directory: /usr/sbin
-# Directory for miscellaneous documentation [/usr/share/doc/bsd-games]: /usr/share/doc/bsd-games-%{version}
-# Set owners/groups on installed files [y]: n
-# Gzip manpages [y]: n
-# Ncurses includes []: -I/usr/include/ncurses
-# (the rest is default)
-
-# then change $RPM_BUILD_DIR path to "."
 %patch3 -p1
-# these files come from patch
-chmod +x install-man install-score
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 
+cat >config.params <<EOF
+bsd_games_cfg_non_interactive=y
+bsd_games_cfg_install_prefix=$RPM_BUILD_ROOT
+bsd_games_cfg_no_build_dirs="banner factor fortune hack"
+bsd_games_cfg_gamesdir=%{_bindir}
+bsd_games_cfg_sbindir=%{_sbindir}
+bsd_games_cfg_docdir=%{_docdir}/bsdgames-%{version}
+bsd_games_cfg_do_chown=n
+bsd_games_cfg_gzip_manpages=n
+bsd_games_cfg_ncurses_includes=-I/usr/include/ncurses
+bsd_games_cfg_ncurses_lib="-lncurses -ltinfo"
+EOF
+
 %build
+./configure
 %{__make} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
@@ -123,8 +123,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	INSTALL_PREFIX=$RPM_BUILD_ROOT
+%{__make} install
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -182,12 +181,20 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2006/12/09 23:59:39  qboosh
+- dropped config patch, use configure in non-interactive mode instead
+- updated monop_rename patch
+- added debian patch with various fixes from debian patch (2.17-8), including
+  some overfow fixes
+- builds now
+
 Revision 1.54  2006/03/30 12:21:20  spider
 - up to 2.17
 - Gentoo Linux Security Advisory GLSA 200603-26
 
 Revision 1.53  2006/03/29 22:52:58  glen
 - GLSA 200603-26 patch fix (maybe gentoo specific, but patch applies)
+[fixes CVE-2006-1539]
 
 Revision 1.52  2006/01/15 11:45:57  glen
 - missing /var/games/phantasia dir; rel 3
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/bsd-games.spec?r1=1.54&r2=1.55&f=u