From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 15 Dec 2013 18:40:19 +0000 (+0100)
Subject: - updated to 1.7.0
X-Git-Tag: auto/th/qemu-1.7.0-1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=68eb235d5ebc2cbc3744b948f768dbe9717b87fd;hp=18e669280f9110eed077132bcbd5a37101cc89bf;p=packages%2Fqemu.git

- updated to 1.7.0
- updated cflags,system-libcacard patches
---

diff --git a/qemu-cflags.patch b/qemu-cflags.patch
index b992962..f9a9eca 100644
--- a/qemu-cflags.patch
+++ b/qemu-cflags.patch
@@ -1,6 +1,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-1.7.0/configure.orig	2013-11-27 23:15:55.000000000 +0100
++++ qemu-1.7.0/configure	2013-12-15 08:37:16.187664605 +0100
+@@ -332,10 +332,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)/include"
@@ -11,12 +11,12 @@
  
  # make source path absolute
  source_path=`cd "$source_path"; pwd`
-@@ -2995,8 +2991,6 @@
+@@ -3549,8 +3545,6 @@
  if test "$gcov" = "yes" ; then
    CFLAGS="-fprofile-arcs -ftest-coverage -g $CFLAGS"
    LDFLAGS="-fprofile-arcs -ftest-coverage $LDFLAGS"
 -elif test "$debug" = "no" ; then
--  CFLAGS="-O2 -D_FORTIFY_SOURCE=2 $CFLAGS"
+-  CFLAGS="-O2 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $CFLAGS"
  fi
  
-
+ 
diff --git a/qemu-system-libcacard.patch b/qemu-system-libcacard.patch
index 0886806..98c11b7 100644
--- a/qemu-system-libcacard.patch
+++ b/qemu-system-libcacard.patch
@@ -1,6 +1,6 @@
---- qemu-1.3.0/configure.orig	2012-12-16 11:06:51.151203881 +0100
-+++ qemu-1.3.0/configure	2012-12-16 11:07:56.571202516 +0100
-@@ -2767,9 +2767,10 @@
+--- qemu-1.7.0/configure.orig	2013-12-15 08:38:07.584329114 +0100
++++ qemu-1.7.0/configure	2013-12-15 08:54:19.730954984 +0100
+@@ -3123,9 +3123,10 @@
  #include <pk11pub.h>
  int main(void) { PK11_FreeSlot(0); return 0; }
  EOF
@@ -14,10 +14,10 @@
      test_cflags="$libcacard_cflags"
      # The header files in nss < 3.13.3 have a bug which causes them to
      # emit a warning. If we're going to compile QEMU with -Werror, then
-@@ -2779,11 +2780,10 @@
+@@ -3136,11 +3137,10 @@
      fi
      if test -n "$libtool" &&
-             $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \
+        $pkg_config --atleast-version=3.12.8 nss && \
 -      compile_prog "$test_cflags" "$libcacard_libs"; then
 +      compile_prog "$test_cflags" "$nss_libs"; then
          smartcard_nss="yes"
@@ -29,7 +29,7 @@
      else
          if test "$smartcard_nss" = "yes"; then
              feature_not_found "nss"
-@@ -3532,6 +3529,8 @@
+@@ -4082,6 +4082,8 @@
    echo "CONFIG_SMARTCARD_NSS=y" >> $config_host_mak
    echo "libcacard_libs=$libcacard_libs" >> $config_host_mak
    echo "libcacard_cflags=$libcacard_cflags" >> $config_host_mak
@@ -37,7 +37,7 @@
 +  echo "nss_cflags=$nss_cflags" >> $config_host_mak
  fi
  
- if test "$usb_redir" = "yes" ; then
+ if test "$libusb" = "yes" ; then
 --- qemu-1.3.0/Makefile.orig	2012-12-03 20:37:05.000000000 +0100
 +++ qemu-1.3.0/Makefile	2012-12-16 11:08:58.001201236 +0100
 @@ -111,9 +111,6 @@
diff --git a/qemu.spec b/qemu.spec
index 845f91e..83ec706 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -15,12 +15,12 @@
 Summary:	QEMU CPU Emulator
 Summary(pl.UTF-8):	QEMU - emulator procesora
 Name:		qemu
-Version:	1.6.1
-Release:	4
+Version:	1.7.0
+Release:	1
 License:	GPL v2+
 Group:		Applications/Emulators
 Source0:	http://wiki.qemu-project.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5:	3a897d722457c5a895cd6ac79a28fda0
+# Source0-md5:	32893941d40d052a5e649efcf06aca06
 Source2:	qemu.binfmt
 # Loads kvm kernel modules at boot
 Source3:	kvm-modules-load.conf
@@ -608,7 +608,6 @@ ln -s ../error.h qapi/error.h
 	--enable-fdt \
 	%{__enable_disable glusterfs} \
 	--enable-libiscsi \
-	--enable-mixemu \
 	%{__enable_disable glx} \
 	%{__enable_disable ceph rbd} \
 	%{__enable_disable rdma} \
@@ -700,7 +699,7 @@ for i in dummy \
 	grep /$i:\$ %{SOURCE2} > $RPM_BUILD_ROOT/usr/lib/binfmt.d/$i.conf
 done < %{SOURCE2}
 
-# already packaged
+# packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-{doc,tech}.html
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/qemu/qmp-commands.txt
 
@@ -759,7 +758,7 @@ fi
 
 %files common -f %{name}.lang
 %defattr(644,root,root,755)
-%doc README qemu-doc.html qemu-tech.html QMP/qmp-commands.txt
+%doc README qemu-doc.html qemu-tech.html qmp-commands.txt
 %attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu-ifup
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/qemu/target-*.conf
 %config(noreplace) %verify(not md5 mtime size) /etc/ksmtuned.conf