devel/d4x d4x-2.5.0-ifwithnoexpression.patch, NONE, 1.1 d4x.spec, 1.4, 1.5

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/devel/d4x
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26680

Modified Files:
	d4x.spec 
Added Files:
	d4x-2.5.0-ifwithnoexpression.patch 
Log Message:
Fix #elif with no expression in sndserv.cc


d4x-2.5.0-ifwithnoexpression.patch:

--- NEW FILE d4x-2.5.0-ifwithnoexpression.patch ---
--- d4x-2.5.0final/main/sndserv.cc.orig	2005-02-14 10:52:41.515352049 +0000
+++ d4x-2.5.0final/main/sndserv.cc	2005-02-14 10:52:55.316316495 +0000
@@ -153,7 +153,7 @@ int d4xWaveFile::read_long(long *len){
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
 	*len =(buf[3] << 24) | (buf[2] << 16) | (buf[1] << 8) | buf[0];
-#elif
+#else
 	*len =(buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
 #endif
 
@@ -166,7 +166,7 @@ int d4xWaveFile::read_short(short *val){
 		return 0;
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
 	*val = (buf[1] << 8) | buf[0];
-#elif
+#else
 	*val = (buf[0] << 8) | buf[1];
 #endif
 	return 1;


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/devel/d4x/d4x.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- d4x.spec	16 Nov 2004 17:34:41 -0000	1.4
+++ d4x.spec	14 Feb 2005 11:03:56 -0000	1.5
@@ -7,11 +7,12 @@
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
 Version: 2.5.0
-Release: %{?pre:0.%{pre}.}2
+Release: %{?pre:0.%{pre}.}3
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
 Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
+Patch0: d4x-2.5.0-ifwithnoexpression.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
 BuildRequires: libao-devel, esound-devel, desktop-file-utils
@@ -27,7 +28,7 @@
 
 %prep
 %setup -n %{name}-%{version}%{?pre}%{?final}
-
+%patch0 -p1
 
 %build
 %configure
@@ -65,6 +66,9 @@
 
 
 %changelog
+* Mon Feb 14 2005 David Woodhouse <dwmw2 at infradead.org> 2.5.0-3
+- Fix #elif with no expression in main/sndserv.cc
+
 * Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 2.5.0-2
 - Bump release to provide Extras upgrade path.