12:21 p.m.
Author: jwrdegoede
Update of /cvs/free/rpms/mamory/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18955
Modified Files:
mamory.spec
Added Files:
mamory-0.2.25-fix-inline-use.patch
Log Message:
* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.2.25-8
- Fix FTBFS (rf#3626)
mamory-0.2.25-fix-inline-use.patch:
common/memalloc.c | 8 ++++----
common/memalloc.h | 8 ++++----
mamory/chainlst.c | 2 +-
mamory/chainlst.h | 2 +-
mamory/printrom.c | 2 +-
sortbox/sortbox.c | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
--- NEW FILE mamory-0.2.25-fix-inline-use.patch ---
diff -up mamory-0.2.25/common/memalloc.c~ mamory-0.2.25/common/memalloc.c
--- mamory-0.2.25/common/memalloc.c~ 2007-08-15 22:35:29.000000000 +0200
+++ mamory-0.2.25/common/memalloc.c 2015-05-16 14:15:20.333243922 +0200
@@ -41,7 +41,7 @@ unsigned int memalloc_nb=0;
unsigned int record_memalloc=0;
#endif /* NDEBUG */
-inline void *xmalloc(size_t num,char* file,int line)
+void *xmalloc(size_t num,char* file,int line)
{
void *new=malloc(num);
if(new==NULL)
@@ -94,7 +94,7 @@ inline void *xmalloc(size_t num,char* fi
return new;
};
-inline void *xrealloc(void *p,size_t num,char* file, int line)
+void *xrealloc(void *p,size_t num,char* file, int line)
{
void *new=NULL;
if(p==NULL)
@@ -105,14 +105,14 @@ inline void *xrealloc(void *p,size_t num
return new;
};
-inline void *xcalloc(size_t num, size_t size,char* file, int line)
+void *xcalloc(size_t num, size_t size,char* file, int line)
{
void *new=xmalloc(num*size,file,line);
memset(new,0,num*size);
return new;
}
-inline char *xstrdup(const char *string,char *file, int line)
+char *xstrdup(const char *string,char *file, int line)
{
char *result;
diff -up mamory-0.2.25/common/memalloc.h~ mamory-0.2.25/common/memalloc.h
--- mamory-0.2.25/common/memalloc.h~ 2015-05-16 13:57:24.000000000 +0200
+++ mamory-0.2.25/common/memalloc.h 2015-05-16 14:15:19.222268842 +0200
@@ -24,10 +24,10 @@
#ifndef COMMON_MEMALLOC_H
#define COMMON_MEMALLOC_H
-extern inline void *xcalloc(size_t num, size_t size,char *file,int line);
-extern inline void *xmalloc(size_t num,char *file, int line);
-extern inline void *xrealloc(void *p, size_t num,char *file,int line);
-extern inline char *xstrdup(const char *string,char *file, int line);
+extern void *xcalloc(size_t num, size_t size,char *file,int line);
+extern void *xmalloc(size_t num,char *file, int line);
+extern void *xrealloc(void *p, size_t num,char *file,int line);
+extern char *xstrdup(const char *string,char *file, int line);
#ifndef NDEBUG
# define XCALLOC(type,num) ((type*)calloc((num),sizeof(type)))
diff -up mamory-0.2.25/mamory/chainlst.c~ mamory-0.2.25/mamory/chainlst.c
--- mamory-0.2.25/mamory/chainlst.c~ 2007-08-15 22:35:30.000000000 +0200
+++ mamory-0.2.25/mamory/chainlst.c 2015-05-16 14:17:52.473364473 +0200
@@ -25,7 +25,7 @@
#include "common.h"
#include <mamory/chainlst.h>
-inline void *CLGetData(s_chainlst *CL)
+void *CLGetData(s_chainlst *CL)
{
return CL->Data;
};
diff -up mamory-0.2.25/mamory/chainlst.h~ mamory-0.2.25/mamory/chainlst.h
--- mamory-0.2.25/mamory/chainlst.h~ 2007-08-15 22:35:30.000000000 +0200
+++ mamory-0.2.25/mamory/chainlst.h 2015-05-16 14:17:59.426325324 +0200
@@ -42,7 +42,7 @@ s_chainlst *CLPrepend(s_chainlst *CL,voi
s_chainlst *CLInsert(s_chainlst *CL,void *data,unsigned int pos);
s_chainlst *CLRemove(s_chainlst *CL,void *data);
s_chainlst *CLRemoveAll(s_chainlst *CL,void *data);
-inline void *CLGetData(s_chainlst *CL);
+void *CLGetData(s_chainlst *CL);
void FreeCL(s_chainlst *CL);
#endif
diff -up mamory-0.2.25/mamory/printrom.c~ mamory-0.2.25/mamory/printrom.c
--- mamory-0.2.25/mamory/printrom.c~ 2007-08-15 22:35:30.000000000 +0200
+++ mamory-0.2.25/mamory/printrom.c 2015-05-16 14:18:07.308433533 +0200
@@ -124,7 +124,7 @@ void fprintGamesListMamoryHeader(FILE *f
};
-inline unsigned char *strquote(unsigned char *string)
+static inline unsigned char *strquote(unsigned char *string)
{
unsigned char *quotedstring=NULL;
unsigned int i=0;
diff -up mamory-0.2.25/sortbox/sortbox.c~ mamory-0.2.25/sortbox/sortbox.c
--- mamory-0.2.25/sortbox/sortbox.c~ 2007-08-15 22:35:30.000000000 +0200
+++ mamory-0.2.25/sortbox/sortbox.c 2015-05-16 14:16:09.752216390 +0200
@@ -168,7 +168,7 @@ void SortBox_AddLetter( s_SortBox *SortB
* Sort the Alphabet used in the SortBox, respecting the priority
*/
-inline void SortAlphabet(s_SBAlphabet *Alphabet)
+static inline void SortAlphabet(s_SBAlphabet *Alphabet)
{
unsigned char ASCII[256]={0};
unsigned char *order;
Index: mamory.spec
===================================================================
RCS file: /cvs/free/rpms/mamory/devel/mamory.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mamory.spec 31 Aug 2014 09:40:43 -0000 1.10
+++ mamory.spec 16 May 2015 12:21:22 -0000 1.11
@@ -1,17 +1,14 @@
Name: mamory
Version: 0.2.25
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: ROM management API and commandline ROM manager for MAME
-
-Group: Applications/Emulators
License: GPLv2 and LGPLv2
URL: http://mamory.sourceforge.net
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Patch0: %{name}-opt.patch
Patch1: %{name}-0.2.25-ppc64.patch
Patch2: %{name}-0.2.25-utf8.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch3: %{name}-0.2.25-fix-inline-use.patch
BuildRequires: expat-devel
%description
@@ -22,6 +19,7 @@
The distributed packages also contain a command line interface that use the
potential of the library libmamory.so.
+
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
@@ -37,6 +35,7 @@
%patch0 -p0 -b .opt~
%patch1 -p0 -b .ppc64~
%patch2 -p0 -b .utf8~
+%patch3 -p1
# Avoid lib64 rpaths
sed -i -e 's|"/lib /usr/lib|"/%{_lib} %{_libdir}|' configure
@@ -53,8 +52,7 @@
%install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+%make_install
# remove libtool archive file
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
@@ -64,27 +62,24 @@
make check
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING TODO DOCS/mamory*
%{_bindir}/mamory
%{_libdir}/*.so.*
%files devel
-%defattr(-,root,root,-)
%{_includedir}/%{name}
%{_libdir}/*.so
%changelog
+* Sat May 16 2015 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.2.25-8
+- Fix FTBFS (rf#3626)
+
* Sun Aug 31 2014 Sérgio Basto <sergio(a)serjux.com> - 0.2.25-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild