updated to 1.2.0.

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index 248c79c67e65c3dc0eea161a09eef2df5e9031d4..15774d80667fd94bd36d0b6e75b87e1dd2f633cd 100644 (file)
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,13 +1,24 @@
---- qemu-kvm-1.0/configure~    2012-02-22 11:45:58.440892282 +0100
-+++ qemu-kvm-1.0/configure     2012-02-23 10:24:12.692463270 +0100
-@@ -2781,10 +2781,6 @@
+--- qemu-1.2.0/configure.orig  2012-09-05 16:03:06.000000000 +0200
++++ qemu-1.2.0/configure       2012-09-23 18:41:12.717279277 +0200
+@@ -281,10 +281,6 @@
+ QEMU_CFLAGS="-Wstrict-prototypes -Wredundant-decls $QEMU_CFLAGS"
+ QEMU_CFLAGS="-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE $QEMU_CFLAGS"
+ QEMU_INCLUDES="-I. -I\$(SRC_PATH) -I\$(SRC_PATH)/fpu"
+-if test "$debug_info" = "yes"; then
+-    CFLAGS="-g $CFLAGS"
+-    LDFLAGS="-g $LDFLAGS"
+-fi
+ 
+ # make source path absolute
+ source_path=`cd "$source_path"; pwd`
+@@ -2995,10 +2991,6 @@
  # End of CC checks
  # After here, no more $cc or $ld runs
  
 -if test "$debug" = "no" ; then
--  CFLAGS="-O2 $CFLAGS"
+-  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
 -fi
 -
- # Consult white-list to determine whether to enable werror
- # by default.  Only enable by default for git builds
- z_version=`cut -f3 -d. $source_path/VERSION`
+ # Disable zero malloc errors for official releases unless explicitly told to
+ # enable/disable
+ if test -z "$zero_malloc" ; then

diff --git a/qemu.spec b/qemu.spec
index 7f23e536e8c5cb53daec5dbe43766ebf6296b085..c0029114b34efb2bc267f7345d39b84a4e470a88 100644 (file)
--- a/qemu.spec
+++ b/qemu.spec
@@ -1,5 +1,6 @@
 # TODO:
 # - package virtfs-proxy-helper, qemu-bridge-helper.
+# - package qemu-system-or32
 # - update patches
 # - qemu-system-ppc -hda ac-ppc.img says:
 #   qemu: could not open disk image ac-ppc.img: error "Success"
@@ -14,13 +15,12 @@
 Summary:       QEMU CPU Emulator
 Summary(pl.UTF-8):     QEMU - emulator procesora
 Name:          qemu
-Version:       1.1.0
+Version:       1.2.0
 Release:       1
 License:       GPL
 Group:         Applications/Emulators
-Source0:       http://wiki.qemu.org/download/%{name}-%{version}-1.tar.bz2
-# Source0-md5: f5c85c229b780bc39268845b6f365fc1
-Patch0:                qemu-cflags.patch
+Source0:       http://wiki.qemu.org/download/%{name}-%{version}.tar.bz2
+# Source0-md5: 78eb1e984f4532aa9f2bdd3c127b5b61
 Patch6:                %{name}-nosdlgui.patch
 # Proof of concept, for reference, do not remove
 Patch8:                %{name}-kde_virtual_workspaces_hack.patch
@@ -283,6 +283,7 @@ ln -s ../error.h qapi/error.h
 ./configure \
        --extra-cflags="%{rpmcflags} -I/usr/include/ncurses" \
        --extra-ldflags="%{rpmldflags}" \
+       --disable-strip \
        --sysconfdir=%{_sysconfdir} \
        --prefix=%{_prefix} \
        --cc="%{__cc}" \