rpms/bsd-games/devel bsd-games-2.17-stdio-c++.patch, NONE, 1.1 bsd-games.spec, 1.9, 1.10

Michael Thomas (wart) fedora-extras-commits at redhat.com
Wed Jan 31 00:16:55 UTC 2007


Author: wart

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

Modified Files:
	bsd-games.spec 
Added Files:
	bsd-games-2.17-stdio-c++.patch 
Log Message:
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


Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bsd-games.spec	22 Nov 2006 19:11:18 -0000	1.9
+++ bsd-games.spec	31 Jan 2007 00:16:25 -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,6 +21,7 @@
 # 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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libtermcap-devel words flex bison
 Requires(Pre): /usr/sbin/groupadd
@@ -45,6 +46,7 @@
 %patch7 -p1 -b .phantasiagid
 %patch8 -p1 -b .monop.rename
 %patch9 -p0 -b .banner.rename
+%patch10 -p0 -b .cplusplus
 
 %build
 # We include a templatized configuration settings file to set
@@ -160,6 +162,9 @@
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Tue Jan 30 2007 Wart <wart at kobold.org> 2.17-17
+- Patch to add extern "C" block to prevent c++ compiler error.
+
 * Sat Nov 18 2006 Wart <wart at kobold.org> 2.17-16
 - Drop the useless game 'wargames'
 




More information about the scm-commits mailing list