- Upstream patches from Jan

25927-x86-domctl-ioport-mapping-range.patch
  25929-tmem-restore-pool-version.patch
  25931-x86-domctl-iomem-mapping-checks.patch
  25940-x86-S3-flush-cache.patch
  25952-x86-MMIO-remap-permissions.patch
  25961-x86-HPET-interrupts.patch
  25962-x86-assign-irq-vector-old.patch
  25965-x86-ucode-Intel-resume.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=205

xen.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 Name:           xen
 ExclusiveArch:  %ix86 x86_64
 %define xvers 4.2
@@ -48,6 +47,7 @@ BuildRequires:  automake
 BuildRequires:  bin86
 BuildRequires:  curl-devel
 BuildRequires:  dev86
+BuildRequires:  fdupes
 BuildRequires:  glib2-devel
 BuildRequires:  graphviz
 BuildRequires:  latex2html
@@ -97,10 +97,10 @@ BuildRequires:  gcc46
 BuildRequires:  libgcc46
 BuildRequires:  libgcc46-32bit
 %endif
-BuildRequires:  gcc-32bit
-BuildRequires:  gcc43-32bit
 BuildRequires:  glibc-32bit
 BuildRequires:  glibc-devel-32bit
+BuildRequires:  gcc-32bit
+BuildRequires:  gcc43-32bit
 %define max_cpus 256
 %define pae_enabled n
 %else
@@ -114,7 +114,7 @@ BuildRequires:  kernel-syms
 BuildRequires:  module-init-tools
 BuildRequires:  xorg-x11
 %endif
-Version:        4.2.0_01
+Version:        4.2.0_02
 Release:        0
 PreReq:         %insserv_prereq %fillup_prereq
 Summary:        Xen Virtualization: Hypervisor (aka VMM aka Microkernel)
@@ -185,18 +185,24 @@ Patch25866:     25866-sercon-ns16550-pci-irq.patch
 Patch25867:     25867-sercon-ns16550-parse.patch
 Patch25874:     25874-x86-EFI-chain-cfg.patch
 Patch25909:     25909-xenpm-consistent.patch
+Patch25927:     25927-x86-domctl-ioport-mapping-range.patch
+Patch25929:     25929-tmem-restore-pool-version.patch
+Patch25931:     25931-x86-domctl-iomem-mapping-checks.patch
+Patch25940:     25940-x86-S3-flush-cache.patch
 Patch25941:     25941-pygrub_always_append_--args.patch
+Patch25952:     25952-x86-MMIO-remap-permissions.patch
+Patch25961:     25961-x86-HPET-interrupts.patch
+Patch25962:     25962-x86-assign-irq-vector-old.patch
+Patch25965:     25965-x86-ucode-Intel-resume.patch
 # Upstream qemu patches
 # Our patches
 Patch301:       xend-config.diff
 Patch302:       xen-destdir.diff
 Patch303:       xen-rpmoptflags.diff
-Patch304:       xen-warnings.diff
-Patch305:       xen-warnings-unused.diff
-Patch306:       xen-changeset.diff
-Patch307:       xen-paths.diff
-Patch308:       xen-xmexample.diff
-Patch309:       xen-xmexample-vti.diff
+Patch304:       xen-changeset.diff
+Patch305:       xen-paths.diff
+Patch306:       xen-xmexample.diff
+Patch307:       xen-xmexample-vti.diff
 Patch310:       xen-fixme-doc.diff
 Patch311:       xen-domUloader.diff
 Patch312:       xen-no-dummy-nfs-ip.diff
@@ -669,7 +675,15 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch25867 -p1
 %patch25874 -p1
 %patch25909 -p1
+%patch25927 -p1
+%patch25929 -p1
+%patch25931 -p1
+%patch25940 -p1
 %patch25941 -p1
+%patch25952 -p1
+%patch25961 -p1
+%patch25962 -p1
+%patch25965 -p1
 # Qemu
 # Our patches
 %patch301 -p1
@@ -679,8 +693,6 @@ tar xfj %{SOURCE6} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch305 -p1
 %patch306 -p1
 %patch307 -p1
-%patch308 -p1
-%patch309 -p1
 %patch310 -p1
 %patch311 -p1
 %patch312 -p1
@@ -1025,6 +1037,8 @@ rm -f  $RPM_BUILD_ROOT/usr/local/share/doc/qemu/qemu-tech.html
 #/usr/share/SuSEfirewall2/services/TEMPLATE
 mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
 install -m 644 %{S:26} $RPM_BUILD_ROOT/%{_fwdefdir}/xend-relocation-server
+# create symlinks for keymaps
+%fdupes -s $RPM_BUILD_ROOT/%{_datadir}
 %else
 # 32 bit hypervisor no longer supported.  Remove dom0 tools.
 rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc