X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xen.spec;h=7047bd010519a32834e09da1078c880e9fbef7fa;hb=e35fda920fff302f6132d89a3d39cc1e5df2d92c;hp=53d8b4ee81fc3545789b6140193532b329cca9d5;hpb=2f3b83cd6d1be686ed48c7312d119b55574750ef;p=packages%2Fxen.git

diff --git a/xen.spec b/xen.spec
index 53d8b4e..7047bd0 100644
--- a/xen.spec
+++ b/xen.spec
@@ -12,25 +12,25 @@
 %bcond_with	pae		# build with PAE (HIGHMEM64G) support
 %bcond_with	hvm		# build with hvm (full virtualization) support
 #
+%define		major	3.2
+%define		minor	1
 Summary:	Xen - a virtual machine monitor
 Summary(pl.UTF-8):	Xen - monitor maszyny wirtualnej
 Name:		xen
-%define		_major	3.2.0
-%define		_minor	0.rc4
-Version:	%{_major}_%{_minor}
+Version:	%{major}.%{minor}
 Release:	0.3
 License:	GPL
 Group:		Applications/System
-#Source0:	http://bits.xensource.com/oss-xen/release/%{_major}-%{_minor}/src.tgz/%{name}-%{version}-src.tgz
-Source0:	%{name}-%{_major}-rc4.tar.bz2
-# Source0-md5:	bc6e3262739b1c40d85d4aace22e7cb3
+Source0:	http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
 Source1:	%{name}-xend.init
 Source2:	%{name}-xendomains.init
 Patch0:		%{name}-python_scripts.patch
 Patch1:		%{name}-gcc.patch
 URL:		http://www.cl.cam.ac.uk/Research/SRG/netos/xen/index.html
+%{?with_hvm:BuildRequires:	bcc}
 BuildRequires:	curl-devel
 BuildRequires:	e2fsprogs-devel
+BuildRequires:	gcc >= 5:3.4
 BuildRequires:	latex2html
 BuildRequires:	libidn-devel
 BuildRequires:	ncurses-devel
@@ -43,20 +43,26 @@ BuildRequires:	tetex-latex-psnfss
 BuildRequires:	transfig
 BuildRequires:	which
 BuildRequires:	zlib-devel
-%{?with_hvm:BuildRequires:	bcc}
 Requires(post,preun):	/sbin/chkconfig
+Requires:	%{name}-libs = %{version}-%{release}
 Requires:	ZopeInterface
 Requires:	bridge-utils
-Requires:	kernel(xen0) = %{_major}
+Requires:	coreutils
+Requires:	diffutils
+Requires:	gawk
+Requires:	iptables
+Requires:	kernel(xen0) = %{major}
 Requires:	losetup
+Requires:	net-tools
+Requires:	python-%{name} = %{version}-%{release}
 Requires:	rc-scripts
+Requires:	sed
+Requires:	util-linux
+Requires:	which
 Obsoletes:	xen-doc
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-#%define		_version	%(echo %{version} |tr _ -)
-%define		_version	%{_major}-rc4-pre
-
 %ifnarch i686 athlon pentium3 pentium4
 %undefine	with_pae
 %endif
@@ -98,25 +104,11 @@ xen libraries.
 %description libs -l pl.UTF-8
 Biblioteki xena.
 
-%package hotplug
-Summary:	xen hotplug
-Group:		Application/System
-
-%description hotplug
-xen hotplug.
-
-%package udev
-Summary:	xen udev
-Group:		Application/System
-
-%description udev
-xen udev.
-
 %package devel
 Summary:	Header files for xen
 Summary(pl.UTF-8):	Pliki nagłówkowe xena
 Group:		Development/Libraries
-Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for xen.
@@ -128,7 +120,7 @@ Pliki nagłówkowe xena.
 Summary:	Static xen libraries
 Summary(pl.UTF-8):	Statyczne biblioteki xena
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{epoch}:%{version}-%{release}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static xen libraries.
@@ -136,14 +128,46 @@ Static xen libraries.
 %description static -l pl.UTF-8
 Statyczne biblioteki xena.
 
+%package hotplug
+Summary:	xen hotplug scripts
+Summary(pl.UTF-8):	Skrypty hotplug dla xena
+Group:		Application/System
+
+%description hotplug
+xen hotplug scripts.
+
+%description hotplug -l pl.UTF-8
+Skrypty hotplug dla xena.
+
+%package udev
+Summary:	xen udev scripts
+Summary(pl.UTF-8):	Skrypty udev dla xena
+Group:		Application/System
+
+%description udev
+xen udev scripts.
+
+%description udev -l pl.UTF-8
+Skrypty udev dla xena.
+
+%package -n python-xen
+Summary:	xen Python modules
+Summary(pl.UTF-8):	Moduły Pythona dla xena
+Group:		Libraries
+Conflicts:	xen < 3.2.1-0.3
+
+%description -n python-xen
+xen Python modules.
+
+%description -n python-xen -l pl.UTF-8
+Moduły Pythona dla xena.
+
 %prep
-%setup -q -n %{name}-%{_major}-rc4
+%setup -q
 %patch0 -p1
 %patch1 -p1
 
-find . -iregex .*.orig -exec rm {} \;
-
-chmod -R u+w .
+find '(' -name '*~' -o -name '*.orig' -o -name '.gitignore' ')' -print0 | xargs -0 -r -l512 rm -fv
 
 %build
 CFLAGS="%{rpmcflags} -I/usr/include/ncurses" \
@@ -158,6 +182,8 @@ rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT/var/run/{xen-hotplug,xend,xenstored}
 
 %{__make} install-xen install-tools install-docs \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
 	%{?with_pae:XEN_TARGET_X86_PAE=y} \
 	DESTDIR=$RPM_BUILD_ROOT \
 	XEN_PYTHON_NATIVE_INSTALL=1
@@ -169,23 +195,25 @@ install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/xendomains
 install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/%{name}/xend-db/{domain,vnet}
 install -d $RPM_BUILD_ROOT%{_sharedstatedir}/xen/save
 
-rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
-
-%{py_comp} $RPM_BUILD_ROOT%{py_sitedir}
-%{py_ocomp} $RPM_BUILD_ROOT%{py_sitedir}
-%{py_comp} $RPM_BUILD_ROOT%{py_sitescriptdir}
-%{py_ocomp} $RPM_BUILD_ROOT%{py_sitescriptdir}
-
 cp -a dist/install/etc/udev $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a dist/install/etc/hotplug $RPM_BUILD_ROOT%{_sysconfdir}
 
+%py_comp $RPM_BUILD_ROOT%{py_sitedir}
+%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+
+%py_postclean
 # remove unneeded files
-#find $RPM_BUILD_ROOT%{py_sitedir} -name '*.py' -exec rm "{}" ";"
-#find $RPM_BUILD_ROOT%{py_sitescriptdir} -name '*.py' -exec rm "{}" ";"
+rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 rm -rf $RPM_BUILD_ROOT%{_docdir}/xen
-rm -rf $RPM_BUILD_ROOT/etc/init.d
+rm -rf $RPM_BUILD_ROOT%{_docdir}/qemu/qemu-doc.html
+rm -rf $RPM_BUILD_ROOT/''etc/init.d
 rm -f $RPM_BUILD_ROOT/boot/xen-3.2.gz
 rm -f $RPM_BUILD_ROOT/boot/xen-3.gz
 
+# conflict with qemu
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/qemu-img.1
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/qemu.1
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -209,8 +237,8 @@ fi
 %defattr(644,root,root,755)
 %doc COPYING README docs/misc/*
 %doc docs/html/*
-/boot/%{name}-syms-%{_version}
-/boot/%{name}-%{_version}.gz
+/boot/%{name}-syms-%{version}
+/boot/%{name}-%{version}.gz
 /boot/%{name}.gz
 %attr(754,root,root) /etc/rc.d/init.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/*
@@ -227,24 +255,12 @@ fi
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/bin
 %attr(744,root,root) %{_libdir}/%{name}/bin/*
-%dir %{_libdir}/%{name}/boot
-%attr(744,root,root) %{_libdir}/%{name}/boot/hvmloader
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib/%{name}
+%endif
+%dir %{_prefix}/lib/%{name}/boot
+%{?with_hvm:%attr(744,root,root) %{_prefix}/lib/%{name}/boot/hvmloader}
 %{_datadir}/xen
-%{py_sitedir}/fsimage.so
-%{py_sitedir}/grub
-%dir %{py_sitedir}/%{name}
-%dir %{py_sitedir}/%{name}/lowlevel
-%{py_sitedir}/%{name}/lowlevel/*.py*
-%attr(755,root,root) %{py_sitedir}/%{name}/lowlevel/*.so
-%{py_sitedir}/%{name}/sv
-%{py_sitedir}/%{name}/util
-%{py_sitedir}/%{name}/web
-%{py_sitedir}/%{name}/xend
-%{py_sitedir}/%{name}/xm
-%{py_sitedir}/%{name}/xsview
-%{py_sitedir}/%{name}/*.py*
-%{py_sitedir}/*.egg-info
-#%{py_sitescriptdir}/*
 %{_mandir}/man?/*
 %{_sharedstatedir}/xen
 %{_sharedstatedir}/xenstored
@@ -263,19 +279,40 @@ fi
 %dir %{_libdir}/fs/ufs
 %attr(755,root,root) %{_libdir}/fs/*/*.so
 
+%files devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_includedir}/*
+
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/lib*.a
+
+%if %{without hvm}
 %files hotplug
 %defattr(644,root,root,755)
 %attr(755,root,root) /etc/hotplug/*
+%endif
 
 %files udev
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/*
 
-%files devel
+%files -n python-xen
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/*
-
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%attr(755,root,root) %{py_sitedir}/fsimage.so
+%{py_sitedir}/grub
+%dir %{py_sitedir}/xen
+%dir %{py_sitedir}/xen/lowlevel
+%{py_sitedir}/xen/lowlevel/*.py*
+%attr(755,root,root) %{py_sitedir}/xen/lowlevel/*.so
+%{py_sitedir}/xen/sv
+%{py_sitedir}/xen/util
+%{py_sitedir}/xen/web
+%{py_sitedir}/xen/xend
+%{py_sitedir}/xen/xm
+%{py_sitedir}/xen/xsview
+%{py_sitedir}/xen/*.py*
+%if "%{py_ver}" > "2.4"
+%{py_sitedir}/*.egg-info
+%endif