- install hotplug, avoid duplicate packaging

[packages/xen.git] / xen.spec

diff --git a/xen.spec b/xen.spec
index 8c25b941021b16fa03b13421fb5b1098e564bc2a..dd1f48a6a0c56df460edbb014eba70b92c39c49b 100644 (file)
--- a/xen.spec
+++ b/xen.spec
@@ -12,23 +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
-Version:       %{_major}.0
+Version:       %{major}.%{minor}
 Release:       0.1
 License:       GPL
 Group:         Applications/System
 Source0:       http://bits.xensource.com/oss-xen/release/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 4aa57328d0802a063fa67dfc063da30e
 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
@@ -41,7 +43,6 @@ BuildRequires:        tetex-latex-psnfss
 BuildRequires: transfig
 BuildRequires: which
 BuildRequires: zlib-devel
-%{?with_hvm:BuildRequires:     bcc}
 Requires(post,preun):  /sbin/chkconfig
 Requires:      ZopeInterface
 Requires:      bridge-utils
@@ -49,7 +50,7 @@ Requires:     coreutils
 Requires:      diffutils
 Requires:      gawk
 Requires:      iptables
-Requires:      kernel(xen0) = %{_major}
+Requires:      kernel(xen0) = %{major}
 Requires:      losetup
 Requires:      net-tools
 Requires:      rc-scripts
@@ -144,9 +145,7 @@ Statyczne biblioteki xena.
 %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" \
@@ -161,6 +160,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
@@ -180,6 +181,7 @@ rm -f $RPM_BUILD_ROOT%{_includedir}/%{name}/COPYING
 %{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}
 
 # remove unneeded files
 #find $RPM_BUILD_ROOT%{py_sitedir} -name '*.py' -exec rm "{}" ";"
@@ -230,7 +232,9 @@ fi
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/bin
 %attr(744,root,root) %{_libdir}/%{name}/bin/*
+%if "%{_lib}" != "lib"
 %dir %{_prefix}/lib/%{name}
+%endif
 %dir %{_prefix}/lib/%{name}/boot
 %attr(744,root,root) %{_prefix}/lib/%{name}/boot/hvmloader
 %{_datadir}/xen
@@ -247,7 +251,9 @@ fi
 %{py_sitedir}/%{name}/xm
 %{py_sitedir}/%{name}/xsview
 %{py_sitedir}/%{name}/*.py*
+%if "%{py_ver}" > "2.4"
 %{py_sitedir}/*.egg-info
+%endif
 #%{py_sitescriptdir}/*
 %{_mandir}/man?/*
 %{_sharedstatedir}/xen
@@ -267,7 +273,7 @@ fi
 %dir %{_libdir}/fs/ufs
 %attr(755,root,root) %{_libdir}/fs/*/*.so
 
-%if ! %{with hvm}
+%if %{without hvm}
 %files hotplug
 %defattr(644,root,root,755)
 %attr(755,root,root) /etc/hotplug/*