rpms/mdsplib/devel mdsplib-0.11-typeerror.patch, NONE, 1.1 mdsplib.spec, 1.5, 1.6

[Karsten Hopp]

Author: karsten

Update of /cvs/extras/rpms/mdsplib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1230

Modified Files:
	mdsplib.spec 
Added Files:
	mdsplib-0.11-typeerror.patch 
Log Message:
- fix conflicting types for 'strndup' on s390*

mdsplib-0.11-typeerror.patch:

--- NEW FILE mdsplib-0.11-typeerror.patch ---
diff -up mdsplib-0.11/src/local.h.orig mdsplib-0.11/src/local.h
--- mdsplib-0.11/src/local.h.orig	2009-03-23 18:37:22.000000000 +0100
+++ mdsplib-0.11/src/local.h	2009-03-23 18:38:11.000000000 +0100
@@ -1175,7 +1175,9 @@ MDSP_BOOL std2ccap(Devaddr *, Diskaddr *
 char *strupr(char *);
 char *strlwr(char *);
 /* char *strdup(char *); */
+#if !defined(__s390__) || !defined(__s390x__)
 char *strndup(char *, int);
+#endif
 int strcmpi(char *, char *);
  
 /* void *memccpy(void *, void *, int, unsigned); */


Index: mdsplib.spec
===================================================================
RCS file: /cvs/extras/rpms/mdsplib/devel/mdsplib.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mdsplib.spec	26 Feb 2009 00:05:18 -0000	1.5
+++ mdsplib.spec	23 Mar 2009 17:53:58 -0000	1.6
@@ -1,13 +1,14 @@
 Summary: METAR Decoder Software Package Library
 Name: mdsplib
 Version: 0.11
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 URL: http://limulus.net/mdsplib/
 Source: http://limulus.net/mdsplib/mdsplib-%{version}.tar.gz
 Patch0: mdsplib-0.11-makefile.patch
 Patch1: mdsplib-0.11-shared.patch
+Patch2: mdsplib-0.11-typeerror.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
@@ -41,6 +42,7 @@
 %setup -q
 %patch0 -p1 -b .makefile
 %patch1 -p1 -b .shared
+%patch2 -p1 -b .typeerr
 
 
 %build
@@ -73,6 +75,9 @@
 
 
 %changelog
+* Mon Mar 23 2009 Karsten Hopp <karsten at redhat.com> 0.11-8
+- fix conflicting types for 'strndup' on s390*
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.11-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild