-diff -ur qemu-kvm-1.2.0/configure qemu-kvm-1.2.0-system-libcacard/configure
---- qemu-kvm-1.2.0/configure 2012-11-09 08:07:04.559211692 +0100
-+++ qemu-kvm-1.2.0-system-libcacard/configure 2012-11-09 07:56:31.483388690 +0100
-@@ -2725,9 +2725,10 @@
+--- qemu-1.2.1/configure.orig 2012-11-25 13:26:46.638846657 +0100
++++ qemu-1.2.1/configure 2012-11-25 13:31:17.258841016 +0100
+@@ -2710,9 +2710,10 @@
#include <pk11pub.h>
int main(void) { PK11_FreeSlot(0); return 0; }
EOF
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
-@@ -2737,11 +2738,10 @@
+@@ -2722,11 +2723,10 @@
test_cflags="-Werror $test_cflags"
fi
if $pkg_config --atleast-version=3.12.8 nss >/dev/null 2>&1 && \
else
if test "$smartcard_nss" = "yes"; then
feature_not_found "nss"
-@@ -3069,9 +3069,6 @@
+@@ -3058,9 +3058,6 @@
+ tools="qemu-ga\$(EXESUF) $tools"
fi
fi
+- if test "$smartcard_nss" = "yes" ; then
+- tools="vscclient\$(EXESUF) $tools"
+- fi
fi
--if test "$smartcard_nss" = "yes" ; then
-- tools="vscclient\$(EXESUF) $tools"
--fi
# Mac OS X ships with a broken assembler
- roms=
-@@ -3454,6 +3451,8 @@
+@@ -3449,6 +3446,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
fi
if test "$usb_redir" = "yes" ; then
-@@ -3909,9 +3908,6 @@
+@@ -3895,9 +3894,6 @@
echo "LIBS+=$libs_softmmu $target_libs_softmmu" >> $config_target_mak
echo "HWDIR=../libhw$target_phys_bits" >> $config_target_mak
echo "subdir-$target: subdir-libhw$target_phys_bits" >> $config_host_mak
case "$target_arch2" in
i386|x86_64)
echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak
-@@ -4118,10 +4114,9 @@
+@@ -4100,10 +4096,9 @@
DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
DIRS="$DIRS roms/seabios roms/vgabios"
DIRS="$DIRS qapi-generated"
---- qemu-1.2.0/configure.orig 2012-10-22 19:32:36.328942334 +0200
-+++ qemu-1.2.0/configure 2012-10-27 13:42:38.111694222 +0200
-@@ -2752,6 +2752,12 @@
+--- qemu-1.2.1/configure.orig 2012-11-25 13:23:09.655517846 +0100
++++ qemu-1.2.1/configure 2012-11-25 13:26:08.662180782 +0100
+@@ -2747,6 +2747,12 @@
usb_redir_libs=$($pkg_config --libs libusbredirparser 2>/dev/null)
QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"
- LIBS="$LIBS $usb_redir_libs"
-+ elif $pkg_config libusbredirparser-0.5 >/dev/null 2>&1 ; then
+ libs_softmmu="$libs_softmmu $usb_redir_libs"
++ elif $pkg_config --atleast-version=0.3.4 libusbredirparser-0.5 >/dev/null 2>&1 ; then
+ usb_redir="yes"
+ usb_redir_cflags=$($pkg_config --cflags libusbredirparser-0.5 2>/dev/null)
+ usb_redir_libs=$($pkg_config --libs libusbredirparser-0.5 2>/dev/null)
+ QEMU_CFLAGS="$QEMU_CFLAGS $usb_redir_cflags"
-+ LIBS="$LIBS $usb_redir_libs"
++ libs_softmmu="$libs_softmmu $usb_redir_libs"
else
if test "$usb_redir" = "yes"; then
feature_not_found "usb-redir"
Summary: QEMU CPU Emulator
Summary(pl.UTF-8): QEMU - emulator procesora
Name: qemu
-Version: 1.2.0
-Release: 6
+Version: 1.2.1
+Release: 1
License: GPL v2+
Group: Applications/Emulators
Source0: http://wiki.qemu.org/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 78eb1e984f4532aa9f2bdd3c127b5b61
+# Source0-md5: 189bc5b87281a72f8c72a0f7ebaa6d00
Patch0: %{name}-cflags.patch
Patch1: vgabios-widescreens.patch
Patch2: %{name}-usbredir.patch