rpms/glob2/devel glob2-0.9.4.1-gcc44.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 glob2.spec, 1.8, 1.9 sources, 1.4, 1.5

Rafał Psota rafalzaq at fedoraproject.org
Sat Jun 20 22:25:48 UTC 2009


Author: rafalzaq

Update of /cvs/pkgs/rpms/glob2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30555

Modified Files:
	.cvsignore glob2.spec sources 
Added Files:
	glob2-0.9.4.1-gcc44.patch 
Log Message:
update to 0.9.4.1

glob2-0.9.4.1-gcc44.patch:

--- NEW FILE glob2-0.9.4.1-gcc44.patch ---
diff -up libgag/include/StreamBackend.h.orig libgag/include/StreamBackend.h
--- libgag/include/StreamBackend.h.orig	2009-03-18 03:46:47.000000000 +0100
+++ libgag/include/StreamBackend.h	2009-06-20 14:21:10.000000000 +0200
@@ -43,7 +43,7 @@ namespace GAGCore
 		virtual void flush(void) = 0;
 		virtual void read(void *data, size_t size) = 0;
 		virtual void putc(int c) = 0;
-		virtual int getc(void) = 0;
+		virtual int get_c(void) = 0;
 		virtual void seekFromStart(int displacement) = 0;
 		virtual void seekFromEnd(int displacement) = 0;
 		virtual void seekRelative(int displacement) = 0;
@@ -67,7 +67,7 @@ namespace GAGCore
 		virtual void flush(void) { assert(fp); fflush(fp); }
 		virtual void read(void *data, size_t size) { assert(fp); fread(data, size, 1, fp); }
 		virtual void putc(int c) { assert(fp); fputc(c, fp); }
-		virtual int getc(void) { assert(fp); return fgetc(fp); }
+		virtual int get_c(void) { assert(fp); return fgetc(fp); }
 		virtual void seekFromStart(int displacement) { assert(fp); fseek(fp, displacement, SEEK_SET); }
 		virtual void seekFromEnd(int displacement) { assert(fp); fseek(fp, displacement, SEEK_END); }
 		virtual void seekRelative(int displacement) { assert(fp); fseek(fp, displacement, SEEK_CUR); }
@@ -92,7 +92,7 @@ namespace GAGCore
 		virtual void flush(void);
 		virtual void read(void *data, size_t size);
 		virtual void putc(int c);
-		virtual int getc(void);
+		virtual int get_c(void);
 		virtual void seekFromStart(int displacement);
 		virtual void seekFromEnd(int displacement);
 		virtual void seekRelative(int displacement);
@@ -117,7 +117,7 @@ namespace GAGCore
 		virtual void flush(void) { }
 		virtual void read(void *data, size_t size);
 		virtual void putc(int c);
-		virtual int getc(void);
+		virtual int get_c(void);
 		virtual void seekFromStart(int displacement);
 		virtual void seekFromEnd(int displacement);
 		virtual void seekRelative(int displacement);
diff -up libgag/src/StreamBackend.cpp.orig libgag/src/StreamBackend.cpp
--- libgag/src/StreamBackend.cpp.orig	2009-03-18 03:46:47.000000000 +0100
+++ libgag/src/StreamBackend.cpp	2009-06-20 14:21:53.000000000 +0200
@@ -75,9 +75,9 @@ namespace GAGCore
 		buffer->putc(c);
 	}
 	
-	int ZLibStreamBackend::getc(void)
+	int ZLibStreamBackend::get_c(void)
 	{
-		return buffer->getc();
+		return buffer->get_c();
 	}
 	
 	void ZLibStreamBackend::seekFromStart(int displacement)
@@ -147,7 +147,7 @@ namespace GAGCore
 		write(&ch, 1);
 	}
 	
-	int MemoryStreamBackend::getc(void)
+	int MemoryStreamBackend::get_c(void)
 	{
 		Uint8 ch;
 		read(&ch, 1);
diff -up libgag/src/Stream.cpp.orig libgag/src/Stream.cpp
--- libgag/src/Stream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
+++ libgag/src/Stream.cpp	2009-06-20 14:21:35.000000000 +0200
@@ -60,7 +60,7 @@ namespace GAGCore
 		std::string s;
 		while (1)
 		{
-			int c = backend->getc();
+			int c = backend->get_c();
 			if(c=='\r')
 				continue;
 			if ((c >= 0) && (c != '\n'))
diff -up libgag/src/TextStream.cpp.orig libgag/src/TextStream.cpp
--- libgag/src/TextStream.cpp.orig	2009-03-18 03:46:47.000000000 +0100
+++ libgag/src/TextStream.cpp	2009-06-20 14:21:22.000000000 +0200
@@ -150,7 +150,7 @@ namespace GAGCore
 		
 		int nextChar(void)
 		{
-			next = stream->getc();
+			next = stream->get_c();
 			if 	(next == '\n')
 			{
 				column = 0;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/glob2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	4 May 2008 20:32:13 -0000	1.4
+++ .cvsignore	20 Jun 2009 22:25:17 -0000	1.5
@@ -1 +1 @@
-glob2-0.9.3.tar.gz
+glob2-0.9.4.1.tar.gz


Index: glob2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/glob2/devel/glob2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- glob2.spec	18 Dec 2008 13:50:19 -0000	1.8
+++ glob2.spec	20 Jun 2009 22:25:17 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           glob2
-Version:        0.9.3
-Release:        2%{?dist}
+Version:        0.9.4.1
+Release:        1%{?dist}
 Summary:        An innovative RTS game
 
 Group:          Amusements/Games
@@ -9,8 +9,9 @@ URL:            http://globulation2.org/
 Source0:        http://dl.sv.nongnu.org/releases/%{name}/%{version}/%{name}-%{version}.tar.gz
 #Source3:        glob2.desktop
 #patch0 fixes polish diacritics
-Patch0:         glob2-texts.pl.patch
-Patch2:         glob2-gcc43.patch
+#Patch0:         glob2-texts.pl.patch
+#Patch2:         glob2-gcc43.patch
+Patch3:         glob2-0.9.4.1-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils,zlib-devel,speex-devel,boost-devel
@@ -32,8 +33,9 @@ Online Gaming (or YOG for short).
 
 %prep
 %setup -q
-%patch0 -p0
-%patch2 -p0
+#%patch0 -p0
+#%patch2 -p0
+%patch3 -p0
 
 sed -i -e '3d' -e '12d' data/glob2.desktop
 sed -i s#"Icon=glob2-icon-48x48"#"Icon=glob2.png"# data/glob2.desktop
@@ -42,12 +44,12 @@ chmod -x campaigns/Tutorial_Campaign.txt
 sed -i 's/\r//' campaigns/Tutorial_Campaign.txt
 
 %build
-scons %{?_smp_mflags} INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} DATADIR=%{_datadir} CXXFLAGS="%{optflags}"
+scons %{?_smp_mflags} INSTALLDIR=$RPM_BUILD_ROOT%{_datadir} BINDIR=$RPM_BUILD_ROOT%{_bindir} DATADIR=%{_datadir} CXXFLAGS="%{optflags}" --portaudio=true
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-scons install
+scons install --portaudio=true
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/
 cp -p data/icons/glob2-icon-64x64.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/glob2.png
@@ -56,6 +58,7 @@ for f in 128x128 16x16 24x24 32x32 48x48
 mv $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2-icon-$f.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/$f/apps/glob2.png
 done
 rm -rf $RPM_BUILD_ROOT%{_datadir}/glob2/data/icons
+find $RPM_BUILD_ROOT%{_datadir} -name *~* -exec rm -rf {} \;
 
 desktop-file-install --vendor="fedora"                  \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications   \
@@ -82,7 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING README
+%doc COPYING README
 %{_bindir}/%{name}
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
@@ -90,6 +93,8 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jun 20 2009 Rafał Psota <rafalzaq at gmail.com> - 0.9.4.1-1
+- update to 0.9.4.1
 * Thu Dec 18 2008 Petr Machata <pmachata at redhat.com> - 0.9.3-2
 - rebuild for new boost
 * Sun May 04 2008 Rafał Psota <rafalzaq at gmail.com> - 0.9.3-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/glob2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	4 May 2008 20:32:13 -0000	1.4
+++ sources	20 Jun 2009 22:25:17 -0000	1.5
@@ -1 +1 @@
-e0483d5864cff4ace5ac8e39eae27429  glob2-0.9.3.tar.gz
+d9a15a0c6e3ad7b6271aec3a2f5422ac  glob2-0.9.4.1.tar.gz




More information about the fedora-extras-commits mailing list