rpms/dosbox/devel dosbox-gcc4.1.patch, NONE, 1.1 dosbox.spec, 1.14, 1.15

[Andreas Bierfert (awjb)]

Author: awjb

Update of /cvs/extras/rpms/dosbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10167

Modified Files:
	dosbox.spec 
Added Files:
	dosbox-gcc4.1.patch 
Log Message:
- add gcc4.1 patch (178618)


dosbox-gcc4.1.patch:

--- NEW FILE dosbox-gcc4.1.patch ---
--- include/programs.h	2006-01-24 21:13:38.000000000 +0000
+++ include/programs.h	2006-01-24 21:13:56.000000000 +0000
@@ -40,7 +40,7 @@
 	CommandLine * cmd;
 	DOS_PSP * psp;
 	virtual void Run(void)=0;
-	bool Program::GetEnvStr(const char * entry,std::string & result);
+	bool GetEnvStr(const char * entry,std::string & result);
 	bool GetEnvNum(Bitu num,std::string & result);
 	Bitu GetEnvCount(void);
 	bool SetEnv(const char * entry,const char * new_string);


Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- dosbox.spec	22 Jan 2006 20:55:07 -0000	1.14
+++ dosbox.spec	25 Jan 2006 12:56:36 -0000	1.15
@@ -11,6 +11,7 @@
 Source1:        dosbox.desktop
 Source2:        dosbox.png
 Patch0:         dosbox-x86-64-build.patch
+Patch1:         dosbox-gcc4.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:  libpng-devel
@@ -33,6 +34,7 @@
 %prep
 %setup -q
 %patch0
+%patch1
 
 %build
 %configure --enable-shots
@@ -75,6 +77,7 @@
 0.64-7
 - add dist
 - rebuild
+- add gcc4.1 patch
 
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.64-6