Accepting request 245649 from home:a_faerber:branches:Virtualization

Clean up v2.1.0 update and libcacard split-off

OBS-URL: https://build.opensuse.org/request/show/245649
OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=225

0001-XXX-dont-dump-core-on-sigabort.patch

@@ -1,4 +1,4 @@
-From 9d12fa380ea51761fa5ebbbdc0d0f35857386b1f Mon Sep 17 00:00:00 2001
+From cd92cadeac41448d9da05993dc36837fb18774d0 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 21 Nov 2011 23:50:36 +0100
 Subject: [PATCH] XXX dont dump core on sigabort

0002-XXX-work-around-SA_RESTART-race-wit.patch

@@ -1,4 +1,4 @@
-From 22405b72847554fc6b6bdbd638c268ace80d7ce6 Mon Sep 17 00:00:00 2001
+From 251831808a392ee0c9dbe4fc0930c8a776a00eb0 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Dec 2011 19:00:01 +0100
 Subject: [PATCH] XXX work around SA_RESTART race with boehm-gc (ARM only)

0003-qemu-0.9.0.cvs-binfmt.patch

@@ -1,4 +1,4 @@
-From 1e506ce87e3b551204e7c8556744cf8cfa92cb85 Mon Sep 17 00:00:00 2001
+From 9def5a721b4ba27bff7ae6acebf01a1e12a2d5d3 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:18:44 +0200
 Subject: [PATCH] qemu-0.9.0.cvs-binfmt

0004-qemu-cvs-alsa_bitfield.patch

@@ -1,4 +1,4 @@
-From a04ffd68a5b5b199ea541c9da5fc3859d93c3818 Mon Sep 17 00:00:00 2001
+From c82f7e1ea51d8b07c0b4d3b911dde45bcbd02560 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:20:50 +0200
 Subject: [PATCH] qemu-cvs-alsa_bitfield

0005-qemu-cvs-alsa_ioctl.patch

@@ -1,4 +1,4 @@
-From a378ff5370f6042713599a80a9abf60911c3b663 Mon Sep 17 00:00:00 2001
+From a3e7d59e61520032f4426310195915e71622631c Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:23:27 +0200
 Subject: [PATCH] qemu-cvs-alsa_ioctl

0006-qemu-cvs-alsa_mmap.patch

@@ -1,4 +1,4 @@
-From 9054622c8f9f227773bc32403859e0072a1630a1 Mon Sep 17 00:00:00 2001
+From 7d78b3ff3cca24f85abe0ae6f7889d802d8a4cd0 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:24:15 +0200
 Subject: [PATCH] qemu-cvs-alsa_mmap

0007-qemu-cvs-gettimeofday.patch

@@ -1,4 +1,4 @@
-From 6433c7791241a69fb875e9612f8ebd181ad1b2a8 Mon Sep 17 00:00:00 2001
+From 5b7a59579eb7851d28eae98a3b621fc06ff2e091 Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:25:41 +0200
 Subject: [PATCH] qemu-cvs-gettimeofday

0008-qemu-cvs-ioctl_debug.patch

@@ -1,4 +1,4 @@
-From 2cfde90a43d75901198213a1620c44b62b915a48 Mon Sep 17 00:00:00 2001
+From 0cfec315dbe8f6c8350315c22ddc83f705b65407 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:26:33 +0200
 Subject: [PATCH] qemu-cvs-ioctl_debug

0009-qemu-cvs-ioctl_nodirection.patch

@@ -1,4 +1,4 @@
-From 5d65a63a5305e42187bb61595bd34ce67916e00b Mon Sep 17 00:00:00 2001
+From 7e3bec5f8e91e36623521aef6a2952d1a0079c3f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 14 Apr 2009 16:27:36 +0200
 Subject: [PATCH] qemu-cvs-ioctl_nodirection

0010-block-vmdk-Support-creation-of-SCSI.patch

@@ -1,4 +1,4 @@
-From a11d2097bce7374843220a31c94186a73b1aa969 Mon Sep 17 00:00:00 2001
+From b990b06fedf9acb38da0e8a5921b203e1572859e Mon Sep 17 00:00:00 2001
 From: Ulrich Hecht <uli@suse.de>
 Date: Tue, 14 Apr 2009 16:37:42 +0200
 Subject: [PATCH] block/vmdk: Support creation of SCSI VMDK images in qemu-img

0011-linux-user-add-binfmt-wrapper-for-a.patch

@@ -1,4 +1,4 @@
-From 7e3816a7a96dc7fa2f699b1929a027f9587b110d Mon Sep 17 00:00:00 2001
+From fe047f7a640629933a20b35c742172d60b198738 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 30 Sep 2011 19:40:36 +0200
 Subject: [PATCH] linux-user: add binfmt wrapper for argv[0] handling

0012-PPC-KVM-Disable-mmu-notifier-check.patch

@@ -1,4 +1,4 @@
-From 62b7da9ebf01803de3768e425ec4742269c0e0ee Mon Sep 17 00:00:00 2001
+From 00558f88ef659515a59debcbd19e304d8a884a5f Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 6 Jan 2012 01:05:55 +0100
 Subject: [PATCH] PPC: KVM: Disable mmu notifier check

0013-linux-user-fix-segfault-deadlock.patch

@@ -1,4 +1,4 @@
-From d4fd71138a97db96f423d44144633637f62f298a Mon Sep 17 00:00:00 2001
+From 222ee94ba6e46ef89a6cc0de6f03b25310af02a7 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Fri, 13 Jan 2012 17:05:41 +0100
 Subject: [PATCH] linux-user: fix segfault deadlock

0014-linux-user-binfmt-support-host-bina.patch

@@ -1,4 +1,4 @@
-From 2dba4056236a9f41b0de729713ba11f9a428d26c Mon Sep 17 00:00:00 2001
+From 70ad0bad051af3ffb284077b6e517d71d21fd12b Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 2 Feb 2012 18:02:33 +0100
 Subject: [PATCH] linux-user: binfmt: support host binaries

0015-target-arm-linux-user-no-tb_flush-o.patch

@@ -1,4 +1,4 @@
-From 56191c08ebab2895ce7362517901ddbdceff3e78 Mon Sep 17 00:00:00 2001
+From b78c0ae32e6300e54acca09212d7d1be07d59567 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 29 May 2012 15:30:01 +0200
 Subject: [PATCH] target-arm: linux-user: no tb_flush on reset

0016-linux-user-Ignore-broken-loop-ioctl.patch

@@ -1,4 +1,4 @@
-From dfb36bf2a5654aed53311fe79be72f236bd5e821 Mon Sep 17 00:00:00 2001
+From 11c173eda98507f9fd9bdafabf60799db436db73 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 12 Jun 2012 04:41:10 +0200
 Subject: [PATCH] linux-user: Ignore broken loop ioctl

0017-linux-user-lock-tcg.patch

@@ -1,4 +1,4 @@
-From 3c7976dbd6b551d7c0c503f54f6056515159d48d Mon Sep 17 00:00:00 2001
+From a0a4043fe6138dbebb794f704cae5a2ca8c12f72 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 5 Jul 2012 17:31:39 +0200
 Subject: [PATCH] linux-user: lock tcg

0018-linux-user-Run-multi-threaded-code-.patch

@@ -1,4 +1,4 @@
-From 6e6f95d867e2722f952fe4b7cd4e6fcdc5e2f3cf Mon Sep 17 00:00:00 2001
+From 8b667524d7227a6c5d6c5d4a5938b62ac368a694 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 10 Jul 2012 20:40:55 +0200
 Subject: [PATCH] linux-user: Run multi-threaded code on a single core

0019-linux-user-lock-tb-flushing-too.patch

@@ -1,4 +1,4 @@
-From cbbf0779a6cf50f973982760792f357b77d91835 Mon Sep 17 00:00:00 2001
+From 58082d09b18f24359eebf35085d5b22c108a4ef9 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 11 Jul 2012 16:47:42 +0200
 Subject: [PATCH] linux-user: lock tb flushing too

0020-linux-user-Fake-proc-cpuinfo.patch

@@ -1,4 +1,4 @@
-From 0ce92834dd3a55e232de8097245f5e51f03af497 Mon Sep 17 00:00:00 2001
+From a869e60296534bb11c1e5b586b11c4863c5ad2b8 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 23 Jul 2012 10:24:14 +0200
 Subject: [PATCH] linux-user: Fake /proc/cpuinfo

0021-linux-user-implement-FS_IOC_GETFLAG.patch

@@ -1,4 +1,4 @@
-From ec0dc12708f5cd1a1880ebe165c8e4b2a0876d86 Mon Sep 17 00:00:00 2001
+From acb4c73ef1d92846e501e7f134e57dc48b722ed9 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 20 Aug 2012 00:02:52 +0200
 Subject: [PATCH] linux-user: implement FS_IOC_GETFLAGS ioctl

0022-linux-user-implement-FS_IOC_SETFLAG.patch

@@ -1,4 +1,4 @@
-From 549adde44ee4762253aab35c4b72bf3fb9b9eb94 Mon Sep 17 00:00:00 2001
+From ffffe724d94f4d993f67b00eeac74fbcaf65b999 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 20 Aug 2012 00:07:13 +0200
 Subject: [PATCH] linux-user: implement FS_IOC_SETFLAGS ioctl

0023-linux-user-XXX-disable-fiemap.patch

@@ -1,4 +1,4 @@
-From 6d699789b883d02ca2b5cf762a1a496cb1d294fa Mon Sep 17 00:00:00 2001
+From 363aa8ac52c31d064763920a3eaf2c27f04f65cd Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 21 Aug 2012 14:20:40 +0200
 Subject: [PATCH] linux-user: XXX disable fiemap

0024-slirp-nooutgoing.patch

@@ -1,4 +1,4 @@
-From 2386ed38a5203b175f5d225d7693f9f3019b1b2f Mon Sep 17 00:00:00 2001
+From 55e156e2925de8dd71fb4e651a4f277903f8eeff Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 29 Aug 2012 18:42:56 +0200
 Subject: [PATCH] slirp: -nooutgoing
@@ -12,7 +12,7 @@ TBD (from SUSE Studio team)
  4 files changed, 40 insertions(+)
 
 diff --git a/qemu-options.hx b/qemu-options.hx
-index 9e54686..0a7247d 100644
+index 1549625..c0f9022 100644
 --- a/qemu-options.hx
 +++ b/qemu-options.hx
 @@ -2795,6 +2795,16 @@ Store the QEMU process PID in @var{file}. It is useful if you launch QEMU

0025-vnc-password-file-and-incoming-conn.patch

@@ -1,4 +1,4 @@
-From 568c674a7dcedee67b067a79ca4a680dd5d8dffd Mon Sep 17 00:00:00 2001
+From 69edadde5ea7988979d8103de43984175de85036 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Wed, 29 Aug 2012 20:06:01 +0200
 Subject: [PATCH] vnc: password-file= and incoming-connections=
@@ -9,7 +9,7 @@ TBD (from SUSE Studio team)
  1 file changed, 71 insertions(+)
 
 diff --git a/ui/vnc.c b/ui/vnc.c
-index 548588a..ab03ee3 100644
+index f8d9b7d..48e6591 100644
 --- a/ui/vnc.c
 +++ b/ui/vnc.c
 @@ -47,6 +47,7 @@ static const struct timeval VNC_REFRESH_LOSSY = { 2, 0 };
@@ -20,7 +20,7 @@ index 548588a..ab03ee3 100644
  
  static int vnc_cursor_define(VncState *vs);
  static void vnc_release_modifiers(VncState *vs);
-@@ -1037,6 +1038,7 @@ static void vnc_disconnect_start(VncState *vs)
+@@ -1039,6 +1040,7 @@ static void vnc_disconnect_start(VncState *vs)
  void vnc_disconnect_finish(VncState *vs)
  {
      int i;
@@ -28,7 +28,7 @@ index 548588a..ab03ee3 100644
  
      vnc_jobs_join(vs); /* Wait encoding jobs */
  
-@@ -1085,6 +1087,13 @@ void vnc_disconnect_finish(VncState *vs)
+@@ -1087,6 +1089,13 @@ void vnc_disconnect_finish(VncState *vs)
      }
      g_free(vs->lossy_rect);
      g_free(vs);
@@ -42,7 +42,7 @@ index 548588a..ab03ee3 100644
  }
  
  int vnc_client_io_error(VncState *vs, int ret, int last_errno)
-@@ -3036,6 +3045,39 @@ char *vnc_display_local_addr(DisplayState *ds)
+@@ -3039,6 +3048,39 @@ char *vnc_display_local_addr(DisplayState *ds)
      return vnc_socket_local_addr("%s:%s", vs->lsock);
  }
  
@@ -82,7 +82,7 @@ index 548588a..ab03ee3 100644
  void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
  {
      VncDisplay *vs = vnc_display;
-@@ -3069,6 +3111,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3072,6 +3114,9 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
      while ((options = strchr(options, ','))) {
          options++;
          if (strncmp(options, "password", 8) == 0) {
@@ -92,7 +92,7 @@ index 548588a..ab03ee3 100644
              if (fips_get_state()) {
                  error_setg(errp,
                             "VNC password auth disabled due to FIPS mode, "
-@@ -3077,6 +3122,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
+@@ -3080,6 +3125,32 @@ void vnc_display_open(DisplayState *ds, const char *display, Error **errp)
                  goto fail;
              }
              password = 1; /* Require password auth */

0026-linux-user-add-more-blk-ioctls.patch

@@ -1,4 +1,4 @@
-From 9c4aad2cda60ee3d0ca7a4fabdf3decc3392b2ae Mon Sep 17 00:00:00 2001
+From ece5c142ad3a6bd137177cab9d0561b8705cbf49 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 10 Oct 2012 10:21:20 +0200
 Subject: [PATCH] linux-user: add more blk ioctls

0027-linux-user-use-target_ulong.patch

@@ -1,4 +1,4 @@
-From 5710d6cf91f323779e6f80432b5e383eb3bb96f0 Mon Sep 17 00:00:00 2001
+From 25ba7a723be4b235d7c4c41b6e48ffea2c0ef25d Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Tue, 9 Oct 2012 09:06:49 +0200
 Subject: [PATCH] linux-user: use target_ulong

0028-block-Add-support-for-DictZip-enabl.patch

@@ -1,4 +1,4 @@
-From 3b259aafe15356db62e11ffd28bb49e608fc9f25 Mon Sep 17 00:00:00 2001
+From adab8f85bbe418699421998c60a401283f1a43c4 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 09:49:37 +0200
 Subject: [PATCH] block: Add support for DictZip enabled gzip files

0029-block-Add-tar-container-format.patch

@@ -1,4 +1,4 @@
-From 7ae392839701cf9de9d232b030de5de78b399b11 Mon Sep 17 00:00:00 2001
+From 58fa4021b526f9f6cb9096ae7522967efd0a5c58 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 5 Aug 2009 17:28:38 +0200
 Subject: [PATCH] block: Add tar container format

0030-Legacy-Patch-kvm-qemu-preXX-dictzip.patch

@@ -1,4 +1,4 @@
-From d73a78b03f5a2ecdd9324691f54802988c448eb2 Mon Sep 17 00:00:00 2001
+From 66bcadd009f3014de9680b5ee1df886360e47c62 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 12 Dec 2012 19:11:30 +0100
 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-dictzip3.patch

0031-Legacy-Patch-kvm-qemu-preXX-report-.patch

@@ -1,4 +1,4 @@
-From 066ff7b47f0d6ed60c5cc2314a6cdb3b46e701fe Mon Sep 17 00:00:00 2001
+From 0645f99a723e9846deb7a978a1851115820ff480 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Wed, 12 Dec 2012 19:11:31 +0100
 Subject: [PATCH] Legacy Patch kvm-qemu-preXX-report-default-mac-used.patch

0032-console-add-question-mark-escape-op.patch

@@ -1,4 +1,4 @@
-From d50517d9fe72cbd9e9a26615c0ef288763003be4 Mon Sep 17 00:00:00 2001
+From a4eee8efce8b672542930a014130c10167f7d6f3 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Mon, 6 Jun 2011 06:53:52 +0200
 Subject: [PATCH] console: add question-mark escape operator

0033-Make-char-muxer-more-robust-wrt-sma.patch

@@ -1,4 +1,4 @@
-From 4f764327a74213eb54b0a9fe7019644df95a6d5a Mon Sep 17 00:00:00 2001
+From 96011c6d5236e738c7e6db5e15484f8c1001e479 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 1 Apr 2010 17:36:23 +0200
 Subject: [PATCH] Make char muxer more robust wrt small FIFOs
@@ -22,7 +22,7 @@ This patch fixes input when using -nographic on s390 for me.
  1 file changed, 16 insertions(+)
 
 diff --git a/qemu-char.c b/qemu-char.c
-index 7acc03f..c0ab288 100644
+index 956be49..d578c23 100644
 --- a/qemu-char.c
 +++ b/qemu-char.c
 @@ -311,6 +311,9 @@ typedef struct {

0034-linux-user-lseek-explicitly-cast-no.patch

@@ -1,4 +1,4 @@
-From 9de42598d5f5117d1fb2a13f36da01e946b0f43f Mon Sep 17 00:00:00 2001
+From 19bca1521857daa9a02fb3e37de6060dce679584 Mon Sep 17 00:00:00 2001
 From: Alexander Graf <agraf@suse.de>
 Date: Thu, 13 Dec 2012 14:29:22 +0100
 Subject: [PATCH] linux-user: lseek: explicitly cast non-set offsets to signed

0035-virtfs-proxy-helper-Provide-__u64-f.patch

@@ -1,4 +1,4 @@
-From 393ae753b3a72824994b6e58e38437b41baa56c7 Mon Sep 17 00:00:00 2001
+From 67a01021fc068d9c760cfde49d1188745f8e1916 Mon Sep 17 00:00:00 2001
 From: Bruce Rogers <brogers@suse.com>
 Date: Thu, 16 May 2013 12:39:10 +0200
 Subject: [PATCH] virtfs-proxy-helper: Provide __u64 for broken

0036-configure-Enable-PIE-for-ppc-and-pp.patch

@@ -1,4 +1,4 @@
-From 5d53831a6dd2c69e284319860212fb6f3bf7af15 Mon Sep 17 00:00:00 2001
+From 96a2686365ff1c4bbc93677c5e8a4a50fdabd2ee Mon Sep 17 00:00:00 2001
 From: Dinar Valeev <k0da@opensuse.org>
 Date: Wed, 2 Oct 2013 17:56:03 +0200
 Subject: [PATCH] configure: Enable PIE for ppc and ppc64 hosts

0037-tests-Don-t-run-qom-test-twice.patch

@@ -1,4 +1,4 @@
-From 6bcc0297f33189667a882fa2db3a7c7f064fe52b Mon Sep 17 00:00:00 2001
+From 25a2deec354d3c42cbbddeba52473627ae509a8e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Mon, 7 Apr 2014 16:03:08 +0200
 Subject: [PATCH] tests: Don't run qom-test twice

0038-qtest-Increase-socket-timeout.patch

@@ -1,4 +1,4 @@
-From 0cf035b2443562953c3e731b9feed4365553d1f2 Mon Sep 17 00:00:00 2001
+From c2b7e9b2ae4903d633c23be9f76ed8cff7fec645 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
 Date: Thu, 17 Apr 2014 18:39:10 +0200
 Subject: [PATCH] qtest: Increase socket timeout

libcacard.changes

@@ -1,11 +1,15 @@
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Sort BuildRequires alphabetically to avoid changing back and forth
+- Sync'ed deletion of .a and .la to libcacard.spec.in
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
 -------------------------------------------------------------------
 Wed Aug  6 17:29:30 UTC 2014 - coolo@suse.com
 
 - update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
-
--------------------------------------------------------------------
-Wed Aug  6 17:29:08 UTC 2014 - coolo@suse.com
-
 - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
 * Patches dropped:
   0039-fix-full-frame-updates-for-VNC-clie.patch

libcacard.spec

@@ -23,7 +23,7 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 Version:        2.1.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-%{version}.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
 Patch0002:      0002-XXX-work-around-SA_RESTART-race-wit.patch

libcacard.spec.in

@@ -23,7 +23,7 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-%{version}.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
 # Please do not add patches manually here, run update_git.sh.
@@ -36,11 +36,11 @@ BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  glib2-devel
 BuildRequires:  libattr-devel
+BuildRequires:  libtool
+BuildRequires:  mozilla-nss-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  python
 BuildRequires:  zlib-devel
-BuildRequires:  mozilla-nss-devel
-BuildRequires:  libtool
 
 %description
 QEMU is an extremely well-performing CPU emulator that allows you to
@@ -97,6 +97,8 @@ make %{?_smp_mflags} V=1 libcacard.la
 
 %install
 make install-libcacard DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.a
+rm -f $RPM_BUILD_ROOT/%_libdir/libcacard.la
 
 %post   -n libcacard0 -p /sbin/ldconfig
 

qemu-linux-user.changes

@@ -1,6 +1,13 @@
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
 -------------------------------------------------------------------
 Wed Aug  6 17:29:09 UTC 2014 - coolo@suse.com
 
+- update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
 - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
 * Patches dropped:
   0039-fix-full-frame-updates-for-VNC-clie.patch

qemu-linux-user.spec

@@ -23,7 +23,7 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 Version:        2.1.0
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-%{version}.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 Patch0001:      0001-XXX-dont-dump-core-on-sigabort.patch
 Patch0002:      0002-XXX-work-around-SA_RESTART-race-wit.patch

qemu-linux-user.spec.in

@@ -23,7 +23,7 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/qemu-%{version}.tar.bz2
+Source:         http://wiki.qemu.org/download/qemu-2.1.0.tar.bz2
 # This patch queue is auto-generated from https://github.com/openSUSE/qemu
 PATCH_FILES
 # Please do not add patches manually here, run update_git.sh.

qemu.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Aug 21 16:14:37 UTC 2014 - afaerber@suse.de
+
+- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
+- Revert use of %{version} in Source line as it breaks update_git.sh
+
 -------------------------------------------------------------------
 Thu Aug  7 11:12:48 UTC 2014 - coolo@suse.com
 
@@ -8,10 +14,6 @@ Thu Aug  7 11:12:48 UTC 2014 - coolo@suse.com
 Wed Aug  6 17:29:30 UTC 2014 - coolo@suse.com
 
 - update to v2.1.0: http://wiki.qemu-project.org/ChangeLog/2.1
-
--------------------------------------------------------------------
-Wed Aug  6 17:29:08 UTC 2014 - coolo@suse.com
-
 - Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-2.1
 * Patches dropped:
   0039-fix-full-frame-updates-for-VNC-clie.patch

qemu.spec

@@ -45,8 +45,8 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 Version:        2.1.0
 Release:        0
-Source:         http://wiki.qemu.org/download/%name-%{version}.tar.bz2
+Source:         http://wiki.qemu.org/download/%name-2.1.0.tar.bz2
-Source99:       http://wiki.qemu.org/download/%name-%{version}.tar.bz2.sig
+Source99:       http://wiki.qemu.org/download/%name-2.1.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat

qemu.spec.in

@@ -45,8 +45,8 @@ License:        BSD-3-Clause and GPL-2.0 and GPL-2.0+ and LGPL-2.1+ and MIT
 Group:          System/Emulators/PC
 QEMU_VERSION
 Release:        0
-Source:         http://wiki.qemu.org/download/%name-%{version}.tar.bz2
+Source:         http://wiki.qemu.org/download/%name-2.1.0.tar.bz2
-Source99:       http://wiki.qemu.org/download/%name-%{version}.tar.bz2.sig
+Source99:       http://wiki.qemu.org/download/%name-2.1.0.tar.bz2.sig
 Source1:        80-kvm.rules
 Source2:        qemu-ifup
 Source3:        kvm_stat