Author: laxathom Update of /cvs/nonfree/rpms/raine/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18937/F-9 Modified Files: .cvsignore sources Added Files: raine-0.50.11-incdirfix.patch raine-0.50.3-fixcustomcursor.patch raine-0.50.3-fixdatadirloc.patch raine-0.50.3-makefile.patch raine.spec Log Message: Initial import. raine-0.50.11-incdirfix.patch: --- NEW FILE raine-0.50.11-incdirfix.patch --- --- raine-0.50.11/makefile.incdirfix 2008-03-14 22:24:04.000000000 +0000 +++ raine-0.50.11/makefile 2008-03-24 21:47:50.000000000 +0000 @@ -93,7 +93,7 @@ # profiling # CC = gcc -pg -INCDIR= \ +INCDIR= -I. \ -Isource \ -Isource/68000 \ -Isource/68020 \ raine-0.50.3-fixcustomcursor.patch: --- NEW FILE raine-0.50.3-fixcustomcursor.patch --- --- raine-0.50.3/source/sdl/gui.cpp.orig 2007-01-26 10:35:56.000000000 +0000 +++ raine-0.50.3/source/sdl/gui.cpp 2007-02-26 18:00:50.000000000 +0000 @@ -321,7 +321,7 @@ { char str[256]; - setup_mouse_cursor(IMG_Load("bitmaps/cursor.png")); + setup_mouse_cursor(IMG_Load("/usr/share/raine/bitmaps/cursor.png")); #ifdef RAINE_DEBUG print_debug("StartGUI(): START\n"); raine-0.50.3-fixdatadirloc.patch: --- NEW FILE raine-0.50.3-fixdatadirloc.patch --- --- raine-0.50.3/source/raine.cpp.orig 2007-01-25 10:38:31.000000000 +0000 +++ raine-0.50.3/source/raine.cpp 2007-02-26 15:48:23.000000000 +0000 @@ -212,7 +212,7 @@ */ #ifdef RAINE_UNIX - sprintf(dir_cfg.share_path, "/usr/share/games/raine/"); + sprintf(dir_cfg.share_path, "/usr/share/raine/"); sprintf(dir_cfg.exe_path, "%s/.raine/", getenv("HOME")); #else #if !defined(RAINE_WIN32) || defined(__MINGW32__) raine-0.50.3-makefile.patch: --- NEW FILE raine-0.50.3-makefile.patch --- --- raine-0.50.3/makefile.orig 2007-02-22 09:29:23.000000000 +0000 +++ raine-0.50.3/makefile 2007-02-26 17:24:24.000000000 +0000 @@ -20,7 +20,7 @@ # RAINE_DEBUG = 1 # Be verbose ? -# VERBOSE = 1 +VERBOSE = 1 # Use asm video core ? (comment to use C core) ASM_VIDEO_CORE = 1 @@ -202,8 +202,8 @@ SDL = 1 prefix = $(DESTDIR)/usr - bindir = $(prefix)/games - sharedir = $(prefix)/share/games + bindir = $(prefix)/bin + sharedir = $(prefix)/share mandir = $(prefix)/man/man6 rainedata = $(sharedir)/raine ifndef SDL @@ -256,7 +256,6 @@ ifndef SDL ifeq ("$(shell if [ -e /usr/include/vga.h ] || [ -e /usr/local/include/vga.h ]; then echo yes; fi)","yes") -GFX_SVGALIB=1 endif endif @@ -313,7 +312,7 @@ OBJDIR = $(OSTYPE)-sdl endif -include cpuinfo +#include cpuinfo ifdef X86_64 OBJDIR := $(OBJDIR)64 @@ -395,25 +394,18 @@ ifdef RAINE32 # when starting a game -> black screen if -O > 1 (bug in uint64 calculation) -CFLAGS = -O1 +#CFLAGS = -O1 else # Seems to work now, at least with the sdl version ? (to be tested with windows !) -CFLAGS = -O3 +CFLAGS = $(RPMFLAGS) endif CFLAGS += $(INCDIR) \ $(DEFINE) \ - $(_MARCH) \ - -Wno-trigraphs \ - -fschedule-insns2 \ - -funroll-all-loops \ - -fexpensive-optimizations \ - -ffast-math \ - -w \ - -fomit-frame-pointer + $(_MARCH) # This is required for gcc-2.9x (bug in -fomit-frame-pointer) -CFLAGS_MCU = $(_MARCH) -O3 -fexpensive-optimizations # switches for the 68705 mcus +CFLAGS_MCU = $(CFLAGS) ifdef RAINE_UNIX CFLAGS += -pipe @@ -1164,7 +1156,7 @@ ./makedep $(OBJDIR) $(OBJS) > make.dep cpuinfo: - @sh ./detect-cpu +# @sh ./detect-cpu include make.dep @@ -1214,8 +1206,6 @@ endif sh -c "if [ -f hiscore.dat ]; then $(INSTALL_DATA) hiscore.dat $(rainedata); fi" $(INSTALL_DATA) config/cheats.cfg $(rainedata) - $(INSTALL_DATA) raine.desktop $(prefix)/share/applications - $(INSTALL_DATA) raine.png $(prefix)/share/pixmaps install_dirs: $(MD) -pv $(bindir) $(rainedata) $(langdir) $(romdir) $(artdir) $(emudxdir) $(prefix)/share/pixmaps $(prefix)/share/applications $(bitmaps_dir) $(fonts_dir) --- NEW FILE raine.spec --- Name: raine Version: 0.50.11 Release: 1%{?dist} Summary: Arcade emulator focused on Taito and Jaleco games hardware Group: Applications/Emulators License: GPL+ and Distributable URL: http://www.rainemu.com Source0: http://www.rainemu.com/html/archive/raines-%{version}.tar.bz2 Patch0: %{name}-0.50.3-makefile.patch Patch1: %{name}-0.50.3-fixdatadirloc.patch Patch2: %{name}-0.50.3-fixcustomcursor.patch Patch3: %{name}-0.50.11-incdirfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils BuildRequires: libpng-devel BuildRequires: nasm BuildRequires: SDL_image-devel BuildRequires: SDL_ttf-devel BuildRequires: zlib-devel Requires: hicolor-icon-theme # Only compiles on x86 due to extensive x86 assembly ExclusiveArch: %{ix86} %description Raine emulates some M68000, M68020, Z80 and M68705 arcade games and is mainly focused on Taito and Jaleco games hardware. Raine can emulate many nice games now, including new additions from Cave and other companies. %prep %setup -qn %{name}-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 # Fix encoding iconv -f iso8859-1 debian/changelog -t utf8 > changelog # Fix permissions for debuginfo RPM chmod -x */*.c \ */*.cpp \ */*.h \ */*/*.c \ */*/*.h \ */*/*.cpp \ */*/*/*.c \ */*/*/*.h \ */*/*/*.cpp %build make %{?_smp_mflags} RPMFLAGS="%{optflags} -fno-strict-aliasing" # Build desktop icon cat >%{name}.desktop <<EOF [Desktop Entry] Encoding=UTF-8 Name=Raine GenericName=Arcade Emulator Comment=%{summary} Exec=%{name} Icon=%{name} Terminal=false Type=Application StartupNotify=false Categories=Game;Emulator; EOF %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_datadir}/icons/hicolor/32x32/apps install -pm0644 %{name}.png %{buildroot}%{_datadir}/icons/hicolor/32x32/apps desktop-file-install --vendor dribble \ --dir %{buildroot}%{_datadir}/applications \ %{name}.desktop %clean rm -rf %{buildroot} %post # Set SELinux type (requires executable stack & data segment) semanage fcontext -a -t unconfined_execmem_exec_t '%{_bindir}/%{name}' 2>/dev/null || : restorecon '%{_bindir}/%{name}' 2>/dev/null || : touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %postun # Undo SELinux changes on removal if [ $1 -eq 0 ]; then semanage fcontext -d -t unconfined_execmem_exec_t '%{_bindir}/%{name}' 2>/dev/null || : fi touch --no-create %{_datadir}/icons/hicolor if [ -x %{_bindir}/gtk-update-icon-cache ]; then %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %files %defattr(-,root,root,-) %{_bindir}/%{name} %{_datadir}/%{name} %{_datadir}/applications/dribble-%{name}.desktop %{_datadir}/icons/hicolor/32x32/apps/%{name}.png %doc changelog %changelog * Tue Mar 25 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.50.11-1 - Upgrade to 0.50.11 - Dropped changes/* and now include the general changelog - Added patch to include assembler dirs, otherwise compilation fails * Tue Jan 08 2008 Ian Chapman <packages[AT]amiga-hardware.com> 0.50.6-1 - Upgrade to 0.50.6 - Updated selinux %%post/%%postun entries * Sat Jul 07 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.50.5-1 - Upgrade to 0.50.5 - Minor spec changes due to new guidelines - Dropped explicit support for Fedora Core 5 * Sun May 06 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.50.4-1 - Upgrade to 0.50.4 * Sat Mar 17 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.50.3-2 - Changed .desktop category to Game;Emulator; - "Fixed" encoding on changes-antiriad.txt * Sun Feb 25 2007 Ian Chapman <packages[AT]amiga-hardware.com> 0.50.3-1 - Upgrade to 0.50.3 - Updated all patches for new version - Added patch for building with older SDL supplied with FC5 - Dropped allegro-devel buildrequire. Now only uses SDL - Added patch to fix loading of the custom cursor * Mon Oct 23 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.43.4-4 - Drop svgalib support (Dribble BZ #45) * Sat Oct 21 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.43.4-3 - Fix source permissions for debuginfo rpm * Wed Oct 18 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.43.4-2 - Dropped zlib-devel buildrequire, implied by libpng-devel - Added hicolor-icon-theme require - Swapped excludearch tags for exclusivearch tags - Added SELinux context changes due to executable stack & data segment * Fri Oct 06 2006 Ian Chapman <packages[AT]amiga-hardware.com> 0.43.4-1 - Initial Release Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/raine/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 1 Jun 2008 15:54:36 -0000 1.1 +++ .cvsignore 4 Sep 2008 11:21:57 -0000 1.2 @@ -0,0 +1 @@ +raines-0.50.11.tar.bz2 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/raine/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 1 Jun 2008 15:54:36 -0000 1.1 +++ sources 4 Sep 2008 11:21:57 -0000 1.2 @@ -0,0 +1 @@ +d7bad459736dbb77be767ae7d2e2a583 raines-0.50.11.tar.bz2