Author: musuruan Update of /cvs/nonfree/rpms/gens/F-17 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18289 Modified Files: gens.spec Added Files: gens-2.15.5-as-needed.patch gens-2.15.5-ovflfix.patch gens-2.15.5-rpmlint.patch gens-2.15.5-spelling.patch gens-2.15.5-strings.patch Log Message: * Sun Mar 18 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 2.15.5-5 - added patches from various distributions - updated icon cache scriptlet according to packaging guidelines - fixed summary not to repeat package name - fixed spelling in summary gens-2.15.5-as-needed.patch: configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE gens-2.15.5-as-needed.patch --- --- configure.old 2009-02-04 14:41:40.000000000 +0100 +++ configure 2009-02-04 14:48:52.000000000 +0100 @@ -4929,7 +4929,7 @@ { echo "$as_me:$LINENO: result: $with_opengl" >&5 echo "${ECHO_T}$with_opengl" >&6; } if test x$with_opengl = xyes; then - LDFLAGS="$LDFLAGS -lGL" + LIBS="$LIBS -lGL" fi fi gens-2.15.5-ovflfix.patch: cpu_68k.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- NEW FILE gens-2.15.5-ovflfix.patch --- --- src/gens/gens_core/cpu/68k/cpu_68k.c.old 2010-10-28 09:34:52.000000000 +0200 +++ src/gens/gens_core/cpu/68k/cpu_68k.c 2010-10-28 09:35:53.000000000 +0200 @@ -239,8 +239,8 @@ memset (Ram_Word_2M, 0, 256 * 1024); memset (Ram_Word_1M, 0, 256 * 1024); - memset (COMM.Command, 0, 8 * 5); - memset (COMM.Status, 0, 8 * 5); + memset (COMM.Command, 0, sizeof (COMM.Command)); + memset (COMM.Status, 0, sizeof (COMM.Status)); LED_Status = S68K_State = S68K_Mem_WP = S68K_Mem_PM = Ram_Word_State = 0; COMM.Flag = Init_Timer_INT3 = Timer_INT3 = Int_Mask_S68K = 0; gens-2.15.5-rpmlint.patch: emulator/ui_proxy.c | 3 ++- sdllayer/g_sdlsound.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) --- NEW FILE gens-2.15.5-rpmlint.patch --- --- src/gens/emulator/ui_proxy.c +++ src/gens/emulator/ui_proxy.c @@ -183,7 +183,8 @@ // if( (Old_Rend==NORMAL && Num==DOUBLE)||(Old_Rend==DOUBLE && Num==NORMAL) ||Opengl) // this doesn't cover hq2x etc. properly. Let's just always refresh. Refresh_video(); - + + return 0; } int --- src/gens/sdllayer/g_sdlsound.c +++ src/gens/sdllayer/g_sdlsound.c @@ -178,7 +178,7 @@ lpDSBuffer->GetCurrentPosition(&R, NULL); return(R / (Seg_Lenght * Bytes_Per_Unit)); */ - + return 0; } int Lots_In_Audio_Buffer(void) gens-2.15.5-spelling.patch: save.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- NEW FILE gens-2.15.5-spelling.patch --- --- gens-2.15.5.orig/src/gens/util/file/save.c +++ gens-2.15.5/src/gens/util/file/save.c @@ -1943,11 +1943,11 @@ Save_Config (char *File_Name) sprintf (Str_Tmp, "%d", Country); WritePrivateProfileString ("CPU", "Country", Str_Tmp, Conf_File); sprintf (Str_Tmp, "%d", Country_Order[0]); - WritePrivateProfileString ("CPU", "Prefered Country 1", Str_Tmp, Conf_File); + WritePrivateProfileString ("CPU", "Preferred Country 1", Str_Tmp, Conf_File); sprintf (Str_Tmp, "%d", Country_Order[1]); - WritePrivateProfileString ("CPU", "Prefered Country 2", Str_Tmp, Conf_File); + WritePrivateProfileString ("CPU", "Preferred Country 2", Str_Tmp, Conf_File); sprintf (Str_Tmp, "%d", Country_Order[2]); - WritePrivateProfileString ("CPU", "Prefered Country 3", Str_Tmp, Conf_File); + WritePrivateProfileString ("CPU", "Preferred Country 3", Str_Tmp, Conf_File); sprintf (Str_Tmp, "%d", SegaCD_Accurate); WritePrivateProfileString ("CPU", @@ -2425,11 +2425,11 @@ Load_Config (char *File_Name, void *Game Country = GetPrivateProfileInt ("CPU", "Country", -1, Conf_File); Country_Order[0] = - GetPrivateProfileInt ("CPU", "Prefered Country 1", 0, Conf_File); + GetPrivateProfileInt ("CPU", "Preferred Country 1", 0, Conf_File); Country_Order[1] = - GetPrivateProfileInt ("CPU", "Prefered Country 2", 1, Conf_File); + GetPrivateProfileInt ("CPU", "Preferred Country 2", 1, Conf_File); Country_Order[2] = - GetPrivateProfileInt ("CPU", "Prefered Country 3", 2, Conf_File); + GetPrivateProfileInt ("CPU", "Preferred Country 3", 2, Conf_File); SegaCD_Accurate = GetPrivateProfileInt ("CPU", gens-2.15.5-strings.patch: g_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- NEW FILE gens-2.15.5-strings.patch --- diff -urN gens-2.15.5/src/gens/emulator/g_main.c gens-2.15.5-patched/src/gens/emulator/g_main.c --- gens-2.15.5/src/gens/emulator/g_main.c 2008-09-02 08:17:54.000000000 +1100 +++ gens-2.15.5-patched/src/gens/emulator/g_main.c 2011-07-19 19:52:27.783127529 +1100 @@ -776,24 +776,24 @@ { if (SDL_InitSubSystem (SDL_INIT_TIMER) < 0) { - fprintf (stderr, SDL_GetError ()); + fprintf (stderr, "%s", SDL_GetError ()); return 0; } if (SDL_InitSubSystem (SDL_INIT_VIDEO) < 0) { - fprintf (stderr, SDL_GetError ()); + fprintf (stderr, "%s", SDL_GetError ()); return 0; } /* Take it back down now that we know it works. */ SDL_QuitSubSystem (SDL_INIT_VIDEO); if (SDL_InitSubSystem (SDL_INIT_JOYSTICK) < 0) { - fprintf (stderr, SDL_GetError ()); + fprintf (stderr, "%s", SDL_GetError ()); return 0; } if (SDL_InitSubSystem (SDL_INIT_CDROM) < 0) { - fprintf (stderr, SDL_GetError ()); + fprintf (stderr, "%s", SDL_GetError ()); return 0; } Index: gens.spec =================================================================== RCS file: /cvs/nonfree/rpms/gens/F-17/gens.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- gens.spec 8 Feb 2012 23:41:37 -0000 1.7 +++ gens.spec 18 Mar 2012 14:13:00 -0000 1.8 @@ -1,17 +1,31 @@ -Summary: Gens is a win32/unix Sega Genesis / Sega CD / Sega 32X emulator +Summary: A Sega Genesis / Sega CD / Sega 32X emulator Name: gens Version: 2.15.5 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2 Group: Applications/Emulators URL: http://www.gens.me/ Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz Source1: gens.desktop +# Gentoo +# https://bugs.gentoo.org/show_bug.cgi?id=153593 Patch0: gens-2.15.2-romsdir.patch -Patch1: gens-2.15.2-execstack.patch +# https://bugs.gentoo.org/show_bug.cgi?id=340665 +# https://sourceforge.net/tracker/?func=detail&aid=3097146&group_id... +Patch1: gens-2.15.5-ovflfix.patch +# https://bugs.gentoo.org/show_bug.cgi?id=247350 +Patch2: gens-2.15.5-as-needed.patch +# Andrea Musuruane +Patch3: gens-2.15.2-execstack.patch +# GetDeb +# https://bugs.launchpad.net/getdeb.net/+bug/561819 +Patch4: gens-2.15.5-spelling.patch +# Mandriva +Patch5: gens-2.15.5-strings.patch +# OpenSUSE +Patch6: gens-2.15.5-rpmlint.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # This is to build only for ix86 on plague -#ExclusiveArch: %{ix86} ExclusiveArch: i686 BuildRequires: gtk2-devel >= 2.4.0 BuildRequires: SDL-devel >= 1.1.3 @@ -22,13 +36,18 @@ Requires: hicolor-icon-theme %description -Gens is a GPL emulator for the genesis, ported from win32 -to BeOS and linux. It was the fastest on win32, and is pretty fast on linux. +Gens is a GPL emulator for the genesis, ported from win32 to BeOS and Linux. +It was the fastest on win32, and is pretty fast on Linux. %prep %setup -q %patch0 -p1 -%patch1 -p1 +%patch1 -p0 +%patch2 -p0 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p0 # Fix line encoding sed -i 's/\r//' gens.txt @@ -64,17 +83,17 @@ rm -rf %{buildroot} %post -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : -fi +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun -touch --no-create %{_datadir}/icons/hicolor -if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi +%posttrans +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + %files %defattr(-,root,root) %{_bindir}/gens @@ -85,6 +104,12 @@ %doc AUTHORS BUGS COPYING gens.txt history.txt README %changelog +* Sun Mar 18 2012 Andrea Musuruane <musuruan(a)gmail.com&gt; 2.15.5-5 +- added patches from various distributions +- updated icon cache scriptlet according to packaging guidelines +- fixed summary not to repeat package name +- fixed spelling in summary + * Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.15.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild