From 921a208538743d58841b9211fff0c3943faa453d320b38b036873b2c334af084 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 14 Mar 2012 11:55:15 +0000 Subject: [PATCH] - use BuildRequires: gcc46 only in sles11sp2 to avoid issues when gcc47 and newer is the distro default OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=174 --- xen.changes | 6 ++++++ xen.spec | 32 +++++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/xen.changes b/xen.changes index aaff9a4..20271f6 100644 --- a/xen.changes +++ b/xen.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 14 12:53:53 CET 2012 - ohering@suse.de + +- use BuildRequires: gcc46 only in sles11sp2 to avoid issues + when gcc47 and newer is the distro default + ------------------------------------------------------------------- Mon Feb 27 16:05:19 MST 2012 - jfehlig@suse.com diff --git a/xen.spec b/xen.spec index a52e0ff..0118c52 100644 --- a/xen.spec +++ b/xen.spec @@ -16,6 +16,7 @@ # + Name: xen ExclusiveArch: %ix86 x86_64 %define xvers 4.1 @@ -26,7 +27,7 @@ ExclusiveArch: %ix86 x86_64 %define with_stubdom 1 # EFI requires gcc46 or newer # its available in 12.1 or >= sles11sp2 -%if %suse_version > 1140 || %suse_version == 1110 +%if %suse_version == 1110 %define with_gcc46 1 %else %define with_gcc46 0 @@ -533,6 +534,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 @@ -592,6 +594,7 @@ Summary: Xen Virtualization: Libraries Group: System/Kernel #Requires: xen = %{version} + %description libs Xen is a virtual machine monitor for x86 that supports execution of multiple guest operating systems with unprecedented levels of @@ -637,6 +640,7 @@ Authors: %if %{?with_dom0_support}0 + %package tools Summary: Xen Virtualization: Control tools for domain 0 Group: System/Kernel @@ -646,6 +650,7 @@ Requires: bridge-utils multipath-tools python python-curses python-openssl Provides: xen-tools-ioemu = 3.2 Obsoletes: xen-tools-ioemu <= 3.2 + %description tools Xen is a virtual machine monitor for x86 that supports execution of multiple guest operating systems with unprecedented levels of @@ -693,11 +698,13 @@ Authors: Ian Pratt %endif + %package tools-domU Summary: Xen Virtualization: Control tools for domain U Group: System/Kernel Conflicts: xen-tools + %description tools-domU Xen is a virtual machine monitor for x86 that supports execution of multiple guest operating systems with unprecedented levels of @@ -717,6 +724,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 @@ -762,11 +770,13 @@ Authors: %if %{?with_kmp}0 + %package KMP Summary: Xen para-virtual device drivers for fully virtualized guests Group: System/Kernel Conflicts: xen + %description KMP Xen para-virtual device drivers for fully virtualized guests @@ -812,10 +822,12 @@ Xen, but is not available for release due to license restrictions. %if %{?with_dom0_support}0 + %package doc-html 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 @@ -834,6 +846,7 @@ Authors: 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 @@ -850,6 +863,7 @@ Authors: Ian Pratt %endif + %prep %setup -q -n %xen_build_dir -a 1 -a 20000 %patch20000 -p1 @@ -1229,6 +1243,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}} @@ -1264,6 +1279,7 @@ for flavor in %flavors_to_build; do done %endif + %install export CFLAGS="$RPM_OPT_FLAGS" %if %{?with_dom0_support}0 @@ -1466,6 +1482,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 @@ -1482,6 +1499,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons /boot/xen.gz %endif + %files libs %defattr(-,root,root) %{_libdir}/fs/ @@ -1489,6 +1507,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons %if %{?with_dom0_support}0 + %files tools %defattr(-,root,root) /usr/bin/xenalyze @@ -1592,12 +1611,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 @@ -1607,10 +1628,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 @@ -1618,6 +1641,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons %if %{?with_dom0_support}0 + %post tools %if %{?with_xend}0 # with_xend @@ -1663,9 +1687,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 @@ -1680,8 +1706,12 @@ if [ -f /usr/bin/qemu-nbd-xen ]; then fi %endif + %post libs -p /sbin/ldconfig + %postun libs -p /sbin/ldconfig + + %changelog