rpms/mikmod/devel mikmod-3.2.2-beta1-missing-protos.patch, NONE, 1.1 mikmod.spec, 1.39, 1.40

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

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

Modified Files:
	mikmod.spec 
Added Files:
	mikmod-3.2.2-beta1-missing-protos.patch 
Log Message:
* Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.2-8.beta1
- Fix missing prototype compiler warnings


mikmod-3.2.2-beta1-missing-protos.patch:

--- NEW FILE mikmod-3.2.2-beta1-missing-protos.patch ---
diff -up mikmod-3.2.2-beta1/configure~ mikmod-3.2.2-beta1/configure
--- mikmod-3.2.2-beta1/configure~	2008-04-03 15:41:20.000000000 +0200
+++ mikmod-3.2.2-beta1/configure	2008-04-03 15:41:20.000000000 +0200
@@ -3338,6 +3338,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 #include <mikmod.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 char* my_strdup (char *str)
 {
@@ -4116,8 +4116,8 @@ main ()
   for (i = 0; i < 256; i++)
     if (XOR (islower (i), ISLOWER (i))
 	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
+      return (2);
+  return (0);
 }
 _ACEOF
 rm -f conftest$ac_exeext
diff -up mikmod-3.2.2-beta1/src/mutilities.c~ mikmod-3.2.2-beta1/src/mutilities.c
--- mikmod-3.2.2-beta1/src/mutilities.c~	2008-04-03 15:47:52.000000000 +0200
+++ mikmod-3.2.2-beta1/src/mutilities.c	2008-04-03 15:47:52.000000000 +0200
@@ -35,6 +35,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <ctype.h>
 
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>


Index: mikmod.spec
===================================================================
RCS file: /cvs/extras/rpms/mikmod/devel/mikmod.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mikmod.spec	17 Feb 2008 06:11:19 -0000	1.39
+++ mikmod.spec	3 Apr 2008 14:07:55 -0000	1.40
@@ -3,13 +3,14 @@
 Summary: Music module player
 Name: mikmod
 Version: 3.2.2
-Release: 7.beta1%{?dist}
+Release: 8.beta1%{?dist}
 License: GPLv2 and LGPLv2+
 Group: Applications/Multimedia
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: ncurses-devel libmikmod-devel
 URL: http://mikmod.raphnet.net/
 Source0: http://mikmod.raphnet.net/files/mikmod-%{version}-beta1.tar.gz
+Patch0: mikmod-3.2.2-beta1-missing-protos.patch
 
 %description
 MikMod is one of the best and most well known MOD music file players
@@ -23,21 +24,27 @@
 
 Install the mikmod package if you need a MOD music file player.
 
+
 %prep
 %setup -q -n %{name}-%{version}-beta1
+%patch0 -p1
+
 
 %build
 %configure
 make CFLAGS="$RPM_OPT_FLAGS `libmikmod-config --cflags`"
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-, root, root)
 %doc AUTHORS COPYING NEWS README
@@ -45,7 +52,11 @@
 %{_datadir}/mikmod/mikmodrc
 %{_mandir}/man1/mikmod*
 
+
 %changelog
+* Thu Apr  3 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 3.2.2-8.beta1
+- Fix missing prototype compiler warnings
+
 * Fri Feb 15 2008 Jindrich Novy <jnovy at redhat.com> 3.2.2-7.beta1
 - rebuild against new libmikmod