- conflict before package split

[packages/xen.git] / xen.spec

diff --git a/xen.spec b/xen.spec
index a4f27a3ac9157801d98ba4ed386eab4c7060a6b9..7047bd010519a32834e09da1078c880e9fbef7fa 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -18,7 +18,7 @@ Summary:      Xen - a virtual machine monitor
 Summary(pl.UTF-8):     Xen - monitor maszyny wirtualnej
 Name:          xen
 Version:       %{major}.%{minor}
-Release:       0.2
+Release:       0.3
 License:       GPL
 Group:         Applications/System
 Source0:       http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
@@ -44,7 +44,7 @@ BuildRequires:        transfig
 BuildRequires: which
 BuildRequires: zlib-devel
 Requires(post,preun):  /sbin/chkconfig
-Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:      %{name}-libs = %{version}-%{release}
 Requires:      ZopeInterface
 Requires:      bridge-utils
 Requires:      coreutils
@@ -54,9 +54,10 @@ Requires:    iptables
 Requires:      kernel(xen0) = %{major}
 Requires:      losetup
 Requires:      net-tools
+Requires:      python-%{name} = %{version}-%{release}
 Requires:      rc-scripts
 Requires:      sed
-Requires:      util-linux-ng
+Requires:      util-linux
 Requires:      which
 Obsoletes:     xen-doc
 ExclusiveArch: %{ix86} %{x8664}
@@ -103,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.
@@ -133,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.
@@ -141,6 +128,40 @@ 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
 %patch0 -p1
@@ -184,6 +205,7 @@ cp -a dist/install/etc/hotplug $RPM_BUILD_ROOT%{_sysconfdir}
 # remove unneeded files
 rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 rm -rf $RPM_BUILD_ROOT%{_docdir}/xen
+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
@@ -237,24 +259,8 @@ fi
 %dir %{_prefix}/lib/%{name}
 %endif
 %dir %{_prefix}/lib/%{name}/boot
-%attr(744,root,root) %{_prefix}/lib/%{name}/boot/hvmloader
+%{?with_hvm:%attr(744,root,root) %{_prefix}/lib/%{name}/boot/hvmloader}
 %{_datadir}/xen
-%{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
 %{_mandir}/man?/*
 %{_sharedstatedir}/xen
 %{_sharedstatedir}/xenstored
@@ -273,6 +279,15 @@ 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)
@@ -283,11 +298,21 @@ fi
 %defattr(644,root,root,755)
 %config(noreplace) %verify(not md5 mtime size) /etc/udev/*
 
-%files devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_includedir}/*
-
-%files static
+%files -n python-xen
 %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