rpms/dega-sdl/F-15 dega-1.12-Makefile.patch, NONE, 1.1 dega-sdl.spec, 1.4, 1.5
Author: musuruan
Update of /cvs/nonfree/rpms/dega-sdl/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3792
Modified Files:
dega-sdl.spec
Added Files:
dega-1.12-Makefile.patch
Log Message:
* Sun Feb 12 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.12-7
- patched Makefile to link against libm
dega-1.12-Makefile.patch:
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE dega-1.12-Makefile.patch ---
diff -durN dega-1.12.orig/Makefile dega-1.12/Makefile
--- dega-1.12.orig/Makefile 2001-12-20 00:51:14.000000000 +0100
+++ dega-1.12/Makefile 2012-02-12 10:17:15.379107014 +0100
@@ -18,7 +18,7 @@
all: dega
dega: $(SDLOBJ) $(DOZEOBJ) $(MASTOBJ)
- $(CC) -o dega sdl/main.o $(DOZEOBJ) $(MASTOBJ) $(shell sdl-config --libs)
+ $(CC) -o dega sdl/main.o $(DOZEOBJ) $(MASTOBJ) $(shell sdl-config --libs) -lm
doze/dozea.o: doze/dozea.asm
nasm -f elf doze/dozea.asm
Index: dega-sdl.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dega-sdl/F-15/dega-sdl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dega-sdl.spec 28 Mar 2009 14:24:30 -0000 1.4
+++ dega-sdl.spec 17 Mar 2012 20:26:37 -0000 1.5
@@ -1,29 +1,26 @@
Summary: Dega is a Sega Master System emulator
Name: dega-sdl
Version: 1.12
-Release: 5%{?dist}
+Release: 7%{?dist}
License: Distributable
Group: Applications/Emulators
URL: http://www.emulinks.de/emus/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source: http://www.emulinks.de/emus/dega-%{version}.tar.gz
Patch0: dega-1.12-execstack.patch
-# This is to build only for i386/i586 on plague
-#ExclusiveArch: %{ix86}
-%if 0%{?fedora} >= 11
-ExclusiveArch: i586
-%else
-ExclusiveArch: i386
-%endif
+Patch1: dega-1.12-Makefile.patch
+# This is to build only for i386/i686 on plague
+ExclusiveArch: i686
BuildRequires: SDL-devel >= 1.2.0, nasm
%description
-Dega/SDL is a linux port to the original Dega Sega
+Dega/SDL is a Linux port to the original Dega Sega
Master System / Mark III / Game Gear emulator for DOS.
%prep
%setup -q -n dega-%{version}
%patch0 -p1
+%patch1 -p1
# Using Fedora OPTFLAGS
sed -i 's/^OPTFLAGS=/#OPTFLAGS=/' Makefile
@@ -45,6 +42,13 @@
%doc README dega.txt ChangeLog
%changelog
+* Sun Feb 12 2012 Andrea Musuruane <musuruan(a)gmail.com> 1.12-7
+- patched Makefile to link against libm
+
+* Thu Feb 09 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 1.12-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+- Fix default arch
+
* Sat Mar 28 2009 Andrea Musuruane <musuruan(a)gmail.com> 1.12-5
- fixed ExclusiveArch for F11