From 76863efdacaaf762b8b9b57fe5437657ad5ce7cff9093bd346cd5e78a804d913 Mon Sep 17 00:00:00 2001
From: Olaf Hering <ohering@suse.com>
Date: Wed, 9 Nov 2011 06:53:18 +0000
Subject: [PATCH] fix error: patch 23993 defined multiple times

OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=159
---
 xen.spec | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/xen.spec b/xen.spec
index bce2c56..5a12d61 100644
--- a/xen.spec
+++ b/xen.spec
@@ -244,7 +244,6 @@ Patch23978:     23978-xenpaging_check_p2mt_in_p2m_mem_paging_functions.patch
 Patch23979:     23979-xenpaging_document_p2m_mem_paging_functions.patch
 Patch23980:     23980-xenpaging_disallow_paging_in_a_PoD_guest.patch
 Patch23993:     23993-x86-microcode-amd-fix-23871.patch
-Patch23993:     23993-x86-microcode-amd-fix-23871.patch
 # Upstream qemu patches
 # Our patches
 Patch300:       xen-config.diff
@@ -422,6 +421,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %suse_kernel_module_package -n xen um xen -f kmp_filelist
 %endif
 
+
 %description
 Xen is a virtual machine monitor for x86 that supports execution of
 multiple guest operating systems with unprecedented levels of
@@ -483,6 +483,7 @@ Group:          System/Kernel
 #Requires:       xen = %{version}
 AutoReqProv:    on
 
+
 %description libs
 Xen is a virtual machine monitor for x86 that supports execution of
 multiple guest operating systems with unprecedented levels of
@@ -528,6 +529,7 @@ Authors:
 
 %if %{?with_dom0_support}0
 
+
 %package tools
 License:        GPLv2+
 Summary:        Xen Virtualization: Control tools for domain 0
@@ -539,6 +541,7 @@ Provides:       xen-tools-ioemu = 3.2
 Obsoletes:      xen-tools-ioemu <= 3.2
 AutoReqProv:    on
 
+
 %description tools
 Xen is a virtual machine monitor for x86 that supports execution of
 multiple guest operating systems with unprecedented levels of
@@ -586,6 +589,7 @@ Authors:
     Ian Pratt <ian.pratt@cl.cam.ac.uk>
 %endif
 
+
 %package tools-domU
 License:        GPLv2+
 Summary:        Xen Virtualization: Control tools for domain U
@@ -593,6 +597,7 @@ Group:          System/Kernel
 Conflicts:      xen-tools
 AutoReqProv:    on
 
+
 %description tools-domU
 Xen is a virtual machine monitor for x86 that supports execution of
 multiple guest operating systems with unprecedented levels of
@@ -613,6 +618,7 @@ Summary:        Xen Virtualization: Headers and libraries for development
 Group:          System/Kernel
 Requires:       xen-libs = %{version}
 
+
 %description devel
 Xen is a virtual machine monitor for x86 that supports execution of
 multiple guest operating systems with unprecedented levels of
@@ -658,12 +664,14 @@ Authors:
 
 %if %{?with_kmp}0
 
+
 %package KMP
 License:        GPLv2+
 Group:          System/Kernel
 Summary:        Xen para-virtual device drivers for fully virtualized guests
 Conflicts:      xen
 
+
 %description KMP
 Xen para-virtual device drivers for fully virtualized guests
 
@@ -709,11 +717,13 @@ Xen, but is not available for release due to license restrictions.
 
 %if %{?with_dom0_support}0
 
+
 %package doc-html
 License:        GPLv2+
 Summary:        Xen Virtualization: HTML documentation
 Group:          Documentation/HTML
 
+
 %description doc-html
 Xen is a virtual machine monitor for x86 that supports execution of
 multiple guest operating systems with unprecedented levels of
@@ -733,6 +743,7 @@ License:        GPLv2+
 Summary:        Xen Virtualization: PDF documentation
 Group:          Documentation/Other
 
+
 %description doc-pdf
 Xen is a virtual machine monitor for x86 that supports execution of
 multiple guest operating systems with unprecedented levels of
@@ -749,6 +760,7 @@ Authors:
     Ian Pratt <ian.pratt@cl.cam.ac.uk>
 %endif
 
+
 %prep
 %setup -q -n %xen_build_dir -a 1 -a 20000
 %patch20000 -p1
@@ -1017,6 +1029,7 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
 %patch99998 -p1
 %patch99999 -p1
 
+
 %build
 XEN_EXTRAVERSION=%version-%release
 XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
@@ -1052,6 +1065,7 @@ for flavor in %flavors_to_build; do
 done
 %endif
 
+
 %install
 export CFLAGS="$RPM_OPT_FLAGS"
 %if %{?with_dom0_support}0
@@ -1254,6 +1268,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 
 %if %{?with_dom0_support}0
 
+
 %files -f xen.files.txt
 %defattr(-,root,root)
 /boot/xen-%{version}-%{release}.gz
@@ -1270,6 +1285,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 /boot/xen.gz
 %endif
 
+
 %files libs
 %defattr(-,root,root)
 %{_libdir}/fs/
@@ -1277,6 +1293,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 
 %if %{?with_dom0_support}0
 
+
 %files tools
 %defattr(-,root,root)
 /usr/bin/xenalyze
@@ -1380,12 +1397,14 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 %config %{_fwdefdir}/xend-relocation-server
 %endif
 
+
 %files tools-domU
 %defattr(-,root,root)
 /usr/bin/xen-detect
 /bin/domu-xenstore
 /bin/xenstore-*
 
+
 %files devel
 %defattr(-,root,root)
 %{_bindir}/serial-split
@@ -1395,10 +1414,12 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 
 %if %{?with_dom0_support}0
 
+
 %files doc-html
 %defattr(-,root,root)
 %{_defaultdocdir}/xen/html
 
+
 %files doc-pdf
 %defattr(-,root,root)
 %{_defaultdocdir}/xen/pdf
@@ -1406,6 +1427,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
 
 %if %{?with_dom0_support}0
 
+
 %post tools
 %if %{?with_xend}0
 # with_xend
@@ -1451,9 +1473,11 @@ if [ -f /usr/bin/qemu-nbd ]; then
     ln -s /usr/bin/qemu-nbd /usr/bin/qemu-nbd-xen
 fi
 
+
 %preun tools
 %{stop_on_removal xendomains xend xencommons}
 
+
 %postun tools
 %if %{?with_xend}0
 # with_xend
@@ -1468,8 +1492,12 @@ if [ -f /usr/bin/qemu-nbd-xen ]; then
 fi
 %endif
 
+
 %post libs -p /sbin/ldconfig
 
+
 %postun libs -p /sbin/ldconfig
 
+
+
 %changelog