- 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
This commit is contained in:
Olaf Hering 2012-03-14 11:55:15 +00:00 committed by Git OBS Bridge
parent d220be6646
commit 921a208538
2 changed files with 37 additions and 1 deletions

View File

@ -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 Mon Feb 27 16:05:19 MST 2012 - jfehlig@suse.com

View File

@ -16,6 +16,7 @@
# #
Name: xen Name: xen
ExclusiveArch: %ix86 x86_64 ExclusiveArch: %ix86 x86_64
%define xvers 4.1 %define xvers 4.1
@ -26,7 +27,7 @@ ExclusiveArch: %ix86 x86_64
%define with_stubdom 1 %define with_stubdom 1
# EFI requires gcc46 or newer # EFI requires gcc46 or newer
# its available in 12.1 or >= sles11sp2 # its available in 12.1 or >= sles11sp2
%if %suse_version > 1140 || %suse_version == 1110 %if %suse_version == 1110
%define with_gcc46 1 %define with_gcc46 1
%else %else
%define with_gcc46 0 %define with_gcc46 0
@ -533,6 +534,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%suse_kernel_module_package -n xen um xen -f kmp_filelist %suse_kernel_module_package -n xen um xen -f kmp_filelist
%endif %endif
%description %description
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -592,6 +594,7 @@ Summary: Xen Virtualization: Libraries
Group: System/Kernel Group: System/Kernel
#Requires: xen = %{version} #Requires: xen = %{version}
%description libs %description libs
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -637,6 +640,7 @@ Authors:
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%package tools %package tools
Summary: Xen Virtualization: Control tools for domain 0 Summary: Xen Virtualization: Control tools for domain 0
Group: System/Kernel Group: System/Kernel
@ -646,6 +650,7 @@ Requires: bridge-utils multipath-tools python python-curses python-openssl
Provides: xen-tools-ioemu = 3.2 Provides: xen-tools-ioemu = 3.2
Obsoletes: xen-tools-ioemu <= 3.2 Obsoletes: xen-tools-ioemu <= 3.2
%description tools %description tools
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -693,11 +698,13 @@ Authors:
Ian Pratt <ian.pratt@cl.cam.ac.uk> Ian Pratt <ian.pratt@cl.cam.ac.uk>
%endif %endif
%package tools-domU %package tools-domU
Summary: Xen Virtualization: Control tools for domain U Summary: Xen Virtualization: Control tools for domain U
Group: System/Kernel Group: System/Kernel
Conflicts: xen-tools Conflicts: xen-tools
%description tools-domU %description tools-domU
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -717,6 +724,7 @@ Summary: Xen Virtualization: Headers and libraries for development
Group: System/Kernel Group: System/Kernel
Requires: xen-libs = %{version} Requires: xen-libs = %{version}
%description devel %description devel
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -762,11 +770,13 @@ Authors:
%if %{?with_kmp}0 %if %{?with_kmp}0
%package KMP %package KMP
Summary: Xen para-virtual device drivers for fully virtualized guests Summary: Xen para-virtual device drivers for fully virtualized guests
Group: System/Kernel Group: System/Kernel
Conflicts: xen Conflicts: xen
%description KMP %description KMP
Xen para-virtual device drivers for fully virtualized guests 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 %if %{?with_dom0_support}0
%package doc-html %package doc-html
Summary: Xen Virtualization: HTML documentation Summary: Xen Virtualization: HTML documentation
Group: Documentation/HTML Group: Documentation/HTML
%description doc-html %description doc-html
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -834,6 +846,7 @@ Authors:
Summary: Xen Virtualization: PDF documentation Summary: Xen Virtualization: PDF documentation
Group: Documentation/Other Group: Documentation/Other
%description doc-pdf %description doc-pdf
Xen is a virtual machine monitor for x86 that supports execution of Xen is a virtual machine monitor for x86 that supports execution of
multiple guest operating systems with unprecedented levels of multiple guest operating systems with unprecedented levels of
@ -850,6 +863,7 @@ Authors:
Ian Pratt <ian.pratt@cl.cam.ac.uk> Ian Pratt <ian.pratt@cl.cam.ac.uk>
%endif %endif
%prep %prep
%setup -q -n %xen_build_dir -a 1 -a 20000 %setup -q -n %xen_build_dir -a 1 -a 20000
%patch20000 -p1 %patch20000 -p1
@ -1229,6 +1243,7 @@ tar xfj %{SOURCE2} -C $RPM_BUILD_DIR/%{xen_build_dir}/tools
%patch99998 -p1 %patch99998 -p1
%patch99999 -p1 %patch99999 -p1
%build %build
XEN_EXTRAVERSION=%version-%release XEN_EXTRAVERSION=%version-%release
XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}} XEN_EXTRAVERSION=${XEN_EXTRAVERSION#%{xvers}}
@ -1264,6 +1279,7 @@ for flavor in %flavors_to_build; do
done done
%endif %endif
%install %install
export CFLAGS="$RPM_OPT_FLAGS" export CFLAGS="$RPM_OPT_FLAGS"
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
@ -1466,6 +1482,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%files -f xen.files.txt %files -f xen.files.txt
%defattr(-,root,root) %defattr(-,root,root)
/boot/xen-%{version}-%{release}.gz /boot/xen-%{version}-%{release}.gz
@ -1482,6 +1499,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
/boot/xen.gz /boot/xen.gz
%endif %endif
%files libs %files libs
%defattr(-,root,root) %defattr(-,root,root)
%{_libdir}/fs/ %{_libdir}/fs/
@ -1489,6 +1507,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%files tools %files tools
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/xenalyze /usr/bin/xenalyze
@ -1592,12 +1611,14 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%config %{_fwdefdir}/xend-relocation-server %config %{_fwdefdir}/xend-relocation-server
%endif %endif
%files tools-domU %files tools-domU
%defattr(-,root,root) %defattr(-,root,root)
/usr/bin/xen-detect /usr/bin/xen-detect
/bin/domu-xenstore /bin/domu-xenstore
/bin/xenstore-* /bin/xenstore-*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/serial-split %{_bindir}/serial-split
@ -1607,10 +1628,12 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%files doc-html %files doc-html
%defattr(-,root,root) %defattr(-,root,root)
%{_defaultdocdir}/xen/html %{_defaultdocdir}/xen/html
%files doc-pdf %files doc-pdf
%defattr(-,root,root) %defattr(-,root,root)
%{_defaultdocdir}/xen/pdf %{_defaultdocdir}/xen/pdf
@ -1618,6 +1641,7 @@ rm -f $RPM_BUILD_ROOT/%{_bindir}/xencons
%if %{?with_dom0_support}0 %if %{?with_dom0_support}0
%post tools %post tools
%if %{?with_xend}0 %if %{?with_xend}0
# with_xend # with_xend
@ -1663,9 +1687,11 @@ if [ -f /usr/bin/qemu-nbd ]; then
ln -s /usr/bin/qemu-nbd /usr/bin/qemu-nbd-xen ln -s /usr/bin/qemu-nbd /usr/bin/qemu-nbd-xen
fi fi
%preun tools %preun tools
%{stop_on_removal xendomains xend xencommons} %{stop_on_removal xendomains xend xencommons}
%postun tools %postun tools
%if %{?with_xend}0 %if %{?with_xend}0
# with_xend # with_xend
@ -1680,8 +1706,12 @@ if [ -f /usr/bin/qemu-nbd-xen ]; then
fi fi
%endif %endif
%post libs -p /sbin/ldconfig %post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig
%changelog %changelog