[gsm] Fixed build failure, defuzzified gsm-warnings patch Resolves: rhbz#757136

[Jaroslav Škarvada]

commit 08697a7373ca626bff6d14d12f4280417d630fd0
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Wed Nov 30 14:33:22 2011 +0100

    Fixed build failure, defuzzified gsm-warnings patch
    Resolves: rhbz#757136

 gsm-warnings.patch |   54 ++++++++++++++++++++++++++++-----------------------
 gsm.spec           |    6 ++++-
 2 files changed, 35 insertions(+), 25 deletions(-)
---
diff --git a/gsm-warnings.patch b/gsm-warnings.patch
index 8bec416..663e8ed 100644
--- a/gsm-warnings.patch
+++ b/gsm-warnings.patch
@@ -1,5 +1,28 @@
---- gsm-1.0-pl12/src/code.c.warn	2006-04-26 21:16:50.000000000 +0200
-+++ gsm-1.0-pl12/src/code.c	2007-05-11 00:26:52.000000000 +0200
+diff --git a/add-test/add_test.c b/add-test/add_test.c
+index 8e832df..6405178 100644
+--- a/add-test/add_test.c
++++ b/add-test/add_test.c
+@@ -9,6 +9,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #include "gsm.h"
+ 
+@@ -29,7 +30,7 @@ word M_gsm_abs P((word op1));
+ longword M_gsm_L_mult P((word op1, word op2));
+ longword M_gsm_L_add P((longword op1, longword op2));
+ 
+-help()
++void help(void)
+ {
+ puts( "  add a b      sub a b     mult a b   div    a b" );
+ puts( "L_add A B    L_sub A B   L_mult A B   mult_r a b" );
+diff --git a/src/code.c b/src/code.c
+index 65dd0a3..402f614 100644
+--- a/src/code.c
++++ b/src/code.c
 @@ -9,8 +9,8 @@
  #include	"config.h"
  
@@ -11,33 +34,16 @@
  #else
  #	include "proto.h"
  	extern char	* memcpy P((char *, char *, int));
---- gsm-1.0-pl12/src/toast.c.warn	2006-04-26 21:14:26.000000000 +0200
-+++ gsm-1.0-pl12/src/toast.c	2007-05-11 00:26:52.000000000 +0200
+diff --git a/src/toast.c b/src/toast.c
+index 9823642..6d4166b 100644
+--- a/src/toast.c
++++ b/src/toast.c
 @@ -6,6 +6,8 @@
  
- /* $Header: /home/fedora/jkeating/pkgs/rpms/gsm/devel/gsm-warnings.patch,v 1.1 2007/05/11 23:18:21 rathann Exp $ */
+ /* $Header: /tmp_amd/presto/export/kbs/jutta/src/gsm/RCS/toast.c,v 1.8 1996/07/02 10:41:04 jutta Exp $ */
  
 +#include	<stdio.h>
 +#include	<getopt.h>
  #include	"toast.h"
  
  /*  toast -- lossy sound compression using the gsm library.
---- gsm-1.0-pl12/add-test/add_test.c.warn	2006-04-26 21:14:25.000000000 +0200
-+++ gsm-1.0-pl12/add-test/add_test.c	2007-05-11 00:28:03.000000000 +0200
-@@ -9,6 +9,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <unistd.h>
- 
- #include "gsm.h"
- 
-@@ -29,7 +30,7 @@
- longword M_gsm_L_mult P((word op1, word op2));
- longword M_gsm_L_add P((longword op1, longword op2));
- 
--help()
-+void help(void)
- {
- puts( "  add a b      sub a b     mult a b   div    a b" );
- puts( "L_add A B    L_sub A B   L_mult A B   mult_r a b" );
diff --git a/gsm.spec b/gsm.spec
index cf8eac0..40e28c0 100644
--- a/gsm.spec
+++ b/gsm.spec
@@ -1,6 +1,6 @@
 Name:           gsm
 Version:        1.0.13
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Shared libraries for GSM speech compressor
 
 Group:          System Environment/Libraries
@@ -121,6 +121,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/*
 
 %changelog
+* Wed Nov 30 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 1.0.13-5
+- Fixed build failure, defuzzified gsm-warnings patch
+  Resolves: rhbz#757136
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.13-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild