rpms/qemu/FC-5 qemu-0.7.0-build.patch,1.3,1.4 qemu.spec,1.10,1.11

[David Woodhouse (dwmw2)]

Author: dwmw2

Update of /cvs/extras/rpms/qemu/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32304

Modified Files:
	qemu-0.7.0-build.patch qemu.spec 
Log Message:
drop 

qemu-0.7.0-build.patch:

Index: qemu-0.7.0-build.patch
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/qemu-0.7.0-build.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qemu-0.7.0-build.patch	18 Mar 2006 18:35:40 -0000	1.3
+++ qemu-0.7.0-build.patch	18 Mar 2006 22:45:13 -0000	1.4
@@ -1,33 +1,5 @@
 --- qemu-0.7.0/Makefile.orig	2005-04-27 21:52:05.000000000 +0100
 +++ qemu-0.7.0/Makefile	2005-04-30 11:01:41.000000000 +0100
-@@ -1,6 +1,6 @@
- -include config-host.mak
- 
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing 
-+CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing 
- ifdef CONFIG_DARWIN
- CFLAGS+= -mdynamic-no-pic
- endif
---- qemu-0.7.0/Makefile.target.orig	2005-04-27 21:52:05.000000000 +0100
-+++ qemu-0.7.0/Makefile.target	2005-04-30 11:03:59.000000000 +0100
-@@ -14,7 +14,7 @@
- VPATH+=:$(SRC_PATH)/linux-user
- DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
- endif
--CFLAGS=-Wall -O2 -g -fno-strict-aliasing
-+CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing 
- #CFLAGS+=-Werror
- LDFLAGS=-g
- LIBS=
-@@ -177,7 +177,7 @@
- ifeq ($(ARCH),alpha)
- # -msmall-data is not used because we want two-instruction relocations
- # for the constant constructions
--OP_CFLAGS=-Wall -O2 -g
-+OP_CFLAGS=$(subst -fstack-protector,,$(subst --param=ssp-buffer-size=4,,$(subst -mtune=,-mcpu=,$(RPM_OPT_FLAGS)))) -Wall -fno-strict-aliasing 
- # Ensure there's only a single GP
- CFLAGS += -msmall-data
- LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld
 @@ -463,7 +463,7 @@
  
  install: all 


Index: qemu.spec
===================================================================
RCS file: /cvs/extras/rpms/qemu/FC-5/qemu.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- qemu.spec	18 Mar 2006 18:35:40 -0000	1.10
+++ qemu.spec	18 Mar 2006 22:45:13 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 0.8.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 License: GPL/LGPL
 Group: Development/Tools
@@ -10,7 +10,7 @@
 Source1: qemu.init
 Patch0: qemu-0.7.0-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: SDL-devel compat-gcc-32
+BuildRequires: SDL-devel compat-gcc-32 zlib-devel
 PreReq: /sbin/chkconfig
 PreReq: /sbin/service
 ExclusiveArch: %{ix86} ppc alpha sparc armv4l x86_64
@@ -78,6 +78,9 @@
 %config %{_sysconfdir}/rc.d/init.d/qemu
 
 %changelog
+* Sat Mar 18 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-5
+- Just drop $RPM_OPT_FLAGS. They're too much of a PITA
+
 * Sat Mar 18 2006 David Woodhouse <dwmw2 at infradead.org> 0.8.0-4
 - Disable stack-protector options which gcc 3.2 doesn't like