OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xen?expand=0&rev=23

xen.spec

@@ -34,7 +34,7 @@ BuildRequires:  glibc-32bit glibc-devel-32bit
 BuildRequires:  kernel-source kernel-syms xorg-x11
 %endif
 Version:        3.1.0_15042
-Release:        12
+Release:        14
 License:        GPL v2 or later
 Group:          System/Kernel
 Autoreqprov:    on
@@ -46,7 +46,7 @@ Source3:        boot.xen
 Source4:        boot.local.xenU
 Source5:        init.xend
 Source6:        init.xendomains
-Source7:        logrotate.xend.conf
+Source7:        logrotate.conf
 Source8:        domUloader.py
 Source9:        xmexample.domUloader
 Source10:       xmexample.disks
@@ -79,6 +79,9 @@ Patch18:        15433-pae-ptwr-check.patch
 Patch19:        15444-vmxassist-p2r.patch
 Patch20:        15480-man-xm.patch
 Patch21:        rtl8139-data-corruption.patch
+Patch22:        15168-check-dup-domians.patch
+Patch23:        15587-domid-reset.patch
+Patch24:        15609-save-mem-values.patch
 # Our patches
 Patch100:       xen-config.diff
 Patch101:       xend-config.diff
@@ -89,7 +92,6 @@ Patch106:       xen-changeset.diff
 Patch107:       xen-paths.diff
 Patch108:       xen-xmexample.diff
 Patch109:       xen-xmexample-nbd.diff
-Patch110:       xen-bootloader-dryrun.diff
 Patch111:       xen-domUloader.diff
 Patch113:       xen-network-bridge.diff
 Patch114:       xen-no-dummy-nfs-ip.diff
@@ -547,6 +549,9 @@ Authors:
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
@@ -556,7 +561,6 @@ Authors:
 %patch107 -p1
 %patch108 -p1
 %patch109 -p1
-%patch110 -p1
 %patch111 -p1
 %patch113 -p1
 %patch114 -p1
@@ -618,6 +622,7 @@ Authors:
 %patch208 -p1
 %patch209 -p1
 %patch210 -p1
+%patch211 -p1
 XEN_EXTRAVERSION=%version-%release
 XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
 sed -i "s/XEN_EXTRAVERSION[\t ]*.=.*\$/XEN_EXTRAVERSION  = $XEN_EXTRAVERSION/" xen/Makefile
@@ -729,7 +734,7 @@ install -m644 %SOURCE17 $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.xend
 rm $RPM_BUILD_ROOT/etc/xen/scripts/block-*nbd
 install -m755 %SOURCE11 %SOURCE12 %SOURCE13 %SOURCE18 $RPM_BUILD_ROOT/etc/xen/scripts/
 # logrotate
-install -m644 -D %SOURCE7 $RPM_BUILD_ROOT/etc/logrotate.d/xend
+install -m644 -D %SOURCE7 $RPM_BUILD_ROOT/etc/logrotate.d/xen
 # directories
 mkdir -p $RPM_BUILD_ROOT/var/lib/xenstored
 mkdir -p $RPM_BUILD_ROOT/var/lib/xen/images
@@ -793,8 +798,8 @@ rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 %files tools
 %defattr(-,root,root)
 /usr/bin/lomount
-/usr/bin/xen-detect
 /usr/bin/xencons
+/usr/bin/xenperf
 /usr/bin/xenstore*
 /usr/bin/xentrace*
 /usr/sbin/blktapctrl
@@ -837,7 +842,7 @@ rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 %dir /var/run/xenstored
 /etc/init.d/xend
 /etc/init.d/xendomains
-%config /etc/logrotate.d/xend
+%config /etc/logrotate.d/xen
 %dir %attr(700,root,root) /etc/xen
 /etc/xen/auto
 %config /etc/xen/examples
@@ -864,6 +869,7 @@ rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 
 %files tools-domU
 %defattr(-,root,root)
+/usr/bin/xen-detect
 /bin/xenstore-*
 
 %files tools-ioemu 
@@ -891,7 +897,6 @@ rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 %{_libdir}/libxen*.a
 %{_libdir}/libxen*.so
 /usr/bin/serial-split
-/usr/bin/xenperf
 /usr/include/blktaplib.h
 /usr/include/fsimage*
 /usr/include/xen*.h
@@ -929,6 +934,18 @@ rm -f  $RPM_BUILD_ROOT/%pysite/*.egg-info
 /sbin/ldconfig
 
 %changelog
+* Mon Jul 23 2007 - ccoffing@novell.com
+- Drop xen-bootloader-dryrun.diff; not needed for xen 3.1
+- rpmlint: Actually apply patch for #280637
+- rpmlint: Rename logrotate config from xend to xen
+- Don't package xenperf twice
+- xen-detect is a domU tool
+* Mon Jul 23 2007 - jfehlig@novell.com
+- Added upstream patches that fix various bugs
+  + 15168 fixes check for duplicate domains
+  + 15587 resets domain ID and fixes problems with domain state
+  via Xen API
+  + 15609 stores memory values changed via Xen API
 * Thu Jul 19 2007 - ccoffing@novell.com
 - BuildRequires LibVNCServer-devel
 - Rotate all logs.