X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xen.spec;h=9f99e7b1e48caeff0548f77d2bc40dc8bf66ef11;hb=1c511a8959783e24aac524e0d85149e528eb508b;hp=503f75df0e94e861c20c10b817f6d80bd5da44c7;hpb=f06919826d8fc0c0f2f949ce3eea917347d1a7b6;p=packages%2Fxen.git

diff --git a/xen.spec b/xen.spec
index 503f75d..9f99e7b 100644
--- a/xen.spec
+++ b/xen.spec
@@ -8,10 +8,10 @@
 #
 #
 # Conditional build:
-%bcond_with	opengl		# enable OpenGL support in Xen qemu
-%bcond_without	sdl		# disable SDL support in Xen tools
-%bcond_without	bluetooth	# disable bluetooth support in Xen tools
-%bcond_without	brlapi		# disable brlapi support in Xen tools
+%bcond_without	opengl		# disable OpenGL support in Xen qemu
+%bcond_without	sdl		# disable SDL support in Xen qemu
+%bcond_without	bluetooth	# disable bluetooth support in Xen qemu
+%bcond_without	brlapi		# disable brlapi support in Xen qemu
 %bcond_without	ocaml		# build Ocaml libraries for Xen tools
 #
 # from Config.mk:
@@ -78,37 +78,65 @@ Patch9:		xen-initscript.patch
 Patch10:	xen-quemu-softloat-c99.patch
 URL:		http://www.xen.org/products/xenhyp.html
 %{?with_opengl:BuildRequires:	OpenGL-devel}
-%{?with_sdl:BuildRequires:	SDL-devel}
+%{?with_sdl:BuildRequires:	SDL-devel >= 1.2.1}
+%ifarch %{ix86} %{x8664}
 BuildRequires:	acpica
 BuildRequires:	bcc
+%endif
 %{?with_bluetooth:BuildRequires:	bluez-libs-devel}
 %{?with_brlapi:BuildRequires:	brlapi-devel}
+BuildRequires:	bzip2-devel
+BuildRequires:	ceph-devel
 BuildRequires:	curl-devel
+BuildRequires:	cyrus-sasl-devel >= 2
 BuildRequires:	e2fsprogs-devel
 BuildRequires:	gcc >= 5:3.4
 BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.12
 BuildRequires:	gnutls-devel
 BuildRequires:	latex2html >= 2008
+BuildRequires:	libaio-devel
+BuildRequires:	libiscsi-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	libpng-devel
+BuildRequires:	libuuid-devel
+BuildRequires:	lzo-devel >= 2
 BuildRequires:	ncurses-devel
 %if %{with ocaml}
 BuildRequires:	ocaml >= 3.04-7
 BuildRequires:	ocaml-findlib
 %endif
+BuildRequires:	nss-devel >= 3.12.8
+BuildRequires:	openssl-devel
 BuildRequires:	pciutils-devel
+BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	python-devel
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.647
+BuildRequires:	spice-protocol >= 0.6.0
+BuildRequires:	spice-server-devel >= 0.6.0
 BuildRequires:	texi2html
 BuildRequires:	texlive-dvips
 BuildRequires:	texlive-latex-psnfss
 BuildRequires:	texlive-xetex
+# not adjusted for usbredir 0.5.x (libusbredirparser-0.5)
+#BuildRequires:	usbredir-devel
+BuildRequires:	vde2-devel
 BuildRequires:	which
+# for xfsctl (<xfs/xfs.h>)
+BuildRequires:	xfsprogs-devel
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xz-devel
 BuildRequires:	yajl-devel
 BuildRequires:	zlib-devel
+# FIXME: see qemu configure comments on top of spec
+%{!?with_opengl:BuildConflicts:	OpenGL-devel}
+%{!?with_sdl:BuildConflicts:	SDL-devel}
+%{!?with_sdl:BuildConflicts:	SDL-devel}
+%{!?with_bluetooth:BuildConflicts:	bluez-libs-devel}
+%{!?with_brlapi:BuildConflicts:	brlapi-devel}
 Requires(post,preun):	/sbin/chkconfig
 Requires(post,preun,postun):	systemd-units >= 38
 Requires:	%{name}-libs = %{version}-%{release}
@@ -132,8 +160,8 @@ Obsoletes:	xen-udev
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# some PPC/SPARC boot image in ELF format
-%define         _noautostrip    .*%{_datadir}/xen/qemu/openbios-.*
+# some PPC/SPARC boot images in ELF format
+%define         _noautostrip    .*%{_datadir}/\\(xen/qemu\\|qemu-xen\\)/\\(openbios-.*\\|palcode-clipper\\)
 
 %description
 This package contains the Xen hypervisor and Xen tools, needed to run
@@ -177,6 +205,7 @@ Narzędzia Xena dla maszyn wirtualnych dom0 i domU.
 Summary:	Xen libraries
 Summary(pl.UTF-8):	Biblioteki Xena
 Group:		Libraries
+Requires:	%{name}-libs-guest = %{version}-%{release}
 
 %description libs
 Xen libraries.
@@ -269,7 +298,6 @@ Summary:	Xen Python modules
 Summary(pl.UTF-8):	Moduły Pythona dla Xena
 Group:		Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	%{name}-xen-guest = %{version}-%{release}
 Conflicts:	xen < 3.2.1-0.3
 
 %description -n python-xen
@@ -329,10 +357,16 @@ echo GIT=/bin/false >> Config.mk
 export CFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 export CXXFLAGS="%{rpmcflags} -I/usr/include/ncurses"
 
+# NOTE:
+# - there is a quoting bug (in tools/driver/Makefile) that causes
+#   openssl is used instead of gcrypt; that's OK, openssl is obligatory
+#   anyway (see configure), gcrypt is optional
+# - prevent libiconv from being detected (not needed with glibc)
 cd tools
 %configure \
-	--disable-debug \
-	CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses"
+	CPPFLAGS="%{rpmcppflags} -I/usr/include/ncurses" \
+	ac_cv_lib_iconv_libiconv_open=no \
+	--disable-debug
 cd ..
 
 %{__make} dist-xen dist-tools dist-docs \
@@ -401,8 +435,11 @@ cp -al tools/qemu-xen/docs _doc/qemu-xen
 
 %py_postclean
 
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/qemu.1
 mv $RPM_BUILD_ROOT%{_mandir}/man1/qemu-img{,-xen}.1
 mv $RPM_BUILD_ROOT%{_mandir}/man8/qemu-nbd{,-xen}.8
+# seems not needed, the path is wrong anyway
+%{__rm} $RPM_BUILD_ROOT%{_prefix}/etc/qemu/target-x86_64.conf
 
 # remove unneeded files
 %{__rm} $RPM_BUILD_ROOT/boot/xen-4.2.gz
@@ -411,12 +448,6 @@ mv $RPM_BUILD_ROOT%{_mandir}/man8/qemu-nbd{,-xen}.8
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/qemu
 %{__rm} $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 
-# strip complains on those
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/qemu-xen/openbios-ppc
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/qemu-xen/openbios-sparc32
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/qemu-xen/openbios-sparc64
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/qemu-xen/palcode-clipper
-
 %clean
 rm -rf $RPM_BUILD_ROOT