rpms/olpcsound/OLPC-3 csd-comment-termination.patch, NONE, 1.1 olpcsound.spec, 1.1, 1.2

[Daniel Drake (dsd)]

Author: dsd

Update of /cvs/pkgs/rpms/olpcsound/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4503

Modified Files:
	olpcsound.spec 
Added Files:
	csd-comment-termination.patch 
Log Message:
fix csd comment termination parsing

csd-comment-termination.patch:

--- NEW FILE csd-comment-termination.patch ---
Fix comment termination parsing
Patch taken from csound CVS

Index: olpcsound-5.08.92/Engine/rdorch.c
===================================================================
--- olpcsound-5.08.92.orig/Engine/rdorch.c
+++ olpcsound-5.08.92/Engine/rdorch.c
@@ -201,7 +201,7 @@ static int skiporccomment(CSOUND *csound
         return;
       }
     }
-    if (c == '*' && mode == 0) mode = 1;
+    if (c == '*') mode = 1; /* look for end of comment */
     else if (c == '/' && mode == 1) {
       return srccnt;
     }


Index: olpcsound.spec
===================================================================
RCS file: /cvs/pkgs/rpms/olpcsound/OLPC-3/olpcsound.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- olpcsound.spec	20 Jun 2008 12:19:02 -0000	1.1
+++ olpcsound.spec	28 Jul 2008 14:36:08 -0000	1.2
@@ -1,11 +1,12 @@
 Summary: Csound - sound synthesis language and library, OLPC subset
 Name:   olpcsound        
 Version: 5.08.92
-Release: 2%{?dist}
+Release: 3%{?dist}
 URL: http://csound.sourceforge.net/
 License: LGPLv2+
 Group: Applications/Multimedia
 Source: http://downloads.sourceforge.net/csound/olpcsound-%version.tar.bz2
+Patch0: csd-comment-termination.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: swig python scons alsa-lib-devel liblo-devel libsndfile-devel 
 BuildRequires: libpng-devel libjpeg-devel libvorbis-devel libogg-devel gettext python-devel
@@ -25,6 +26,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{_bindir}/scons buildOLPC=1 customCCFLAGS="%{optflags}" customCXXFLAGS="%{optflags}"
@@ -63,6 +65,9 @@
 
 
 %changelog
+* Mon Jul 27 2008  Daniel Drake <dsd at laptop.org> - 5.08.92-3
+  - add patch from CVS to fix csd comment termination parsing
+
 * Wed May 28 2008  Victor.Lazzarini <vlazzarini at nuim.ie> - 5.08.92-2
   - fixed version format in changelog
   - fixed permissions of Opcodes/hrtfopcodes.c and Util/mixer.c in srcs