X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=7a3dbf6fd2a25a217c24eebf9d6b8abbe185aad6;hb=a741f6faf2baae1e823d334012f6a09e6a1bda51;hp=361d11916cb75dad2e3be0cb0d956d124b092369;hpb=04c2e64c3be921707ac53bcdc78bfb5f50fa91cb;p=util-vserver.git diff --git a/util-vserver.spec b/util-vserver.spec index 361d119..7a3dbf6 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,4 +1,4 @@ -# $Id: util-vserver.spec.in 2482 2007-01-29 23:37:07Z dhozac $ +# $Id: util-vserver.spec.in 2575 2007-08-05 18:35:40Z dhozac $ ## This package understands the following switches: ## --without dietlibc ... disable usage of dietlibc @@ -13,15 +13,17 @@ %global _localstatedir %_var -%global ver %( echo 0.30.213 | sed 's/-.*//' ) -%global subver %( s=`echo 0.30.213 | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} ) -%global fullver 0.30.213 +%global ver %( echo 0.30.214 | sed 's/-.*//' ) +%global subver %( s=`echo 0.30.214 | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} ) +%global fullver 0.30.214 %define name util-vserver -%define version 0.30.213 +%define version 0.30.214 %{!?release_func:%global release_func() 1%{?pldistro:.%{pldistro}}%{?date:.%{date}}} +%global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) + %define _without_dietlibc 1 %define _without_xalan 1 @@ -52,8 +54,6 @@ Obsoletes: vserver < %version BuildRequires: mount vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel beecrypt-devel -# vip6-autod -BuildRequires: libnl-devel %{!?_without_doc:BuildRequires: doxygen tetex-latex} Requires(post): %name-core Requires(pre): %pkglibdir @@ -109,7 +109,7 @@ Requires: %name-lib = %version-%release %package python Summary: Python modules for manipulating vservers Group: Applications/System -Requires: python util-python +Requires: python Obsoletes: util-vserver-py23 resman @@ -208,24 +208,26 @@ automake --add-missing %__make %{?_smp_mflags} all %{!?_without_doc:%__make %{?_smp_mflags} doc} -%__make -C python - %install rm -rf $RPM_BUILD_ROOT %__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution -rm -f $RPM_BUILD_ROOT/%_libdir/*.la +rm -f $RPM_BUILD_ROOT/%_libdir/*.la $RPM_BUILD_ROOT%{python_sitearch}/*.{la,a} MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat -# install python bindings -%__make -C python DESTDIR="$PWD/tmp" install -install -d $RPM_BUILD_ROOT/%{_datadir}/%{name} -install tmp%{_libdir}/python*/site-packages/*.{py,so} $RPM_BUILD_ROOT/%{_datadir}/%{name}/ -install -D -m 755 python/bwlimit $RPM_BUILD_ROOT/%{_sbindir}/bwlimit -install -D -m 755 python/disklimit $RPM_BUILD_ROOT/%{_sbindir}/disklimit +# Generate file list for python package +find "%{buildroot}" -name '*.py' | { while read FILE; do + f="${FILE#%{buildroot}}" + echo "${f}" + # need to touch these files, as they are not produced on FC4 or below + touch ${FILE}c + touch ${FILE}o + echo %%ghost "${f}c" + echo %%ghost "${f}o" +done } > %name-python.list %check || : @@ -275,6 +277,8 @@ fi %chkconfig --del util-vserver # PlanetLab does not require /proc security %chkconfig --del vprocunhide +# vip6-autod handles IPv6 auto-assignments +%chkconfig --add vip6-autod %preun sysv @@ -283,6 +287,7 @@ fi #test "$1" != 0 || %chkconfig --del vprocunhide #test "$1" != 0 || %chkconfig --del vservers-default #test "$1" != 0 || %chkconfig --del util-vserver +test "$1" != 0 || %chkconfig --del vip6-autod %postun sysv @@ -408,75 +413,23 @@ done %{!?_without_doc:%doc lib/apidoc/html} -%post python -pushd %{_datadir}/%{name} >/dev/null - -# Byte compile and install modules -py_modules= -for file in *.py ; do - if [ -n "$py_modules" ] ; then - py_modules="$py_modules," - fi - py_modules="$py_modules '${file%*.py}'" -done -%define setup %{__python} -c "from distutils.core import setup; setup(py_modules=[$py_modules])" -%{setup} build -%{setup} install - -# Install the prebuilt extensions by hand -python_sitelib=$(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -install -m 755 *.so "$python_sitelib"/ - -popd - - -%triggerpostun python -- util-vserver-python, util-vserver-py23 -# RPMs get upgraded by installing the new one, then uninstalling the -# old one. Since we no longer own the byte-compiled modules, they may -# be removed right after we create them in %post if we are upgraded -# from a version that did own them at one point. This section should -# be removed once all packages have been upgraded to at least this -# version. -pushd %{_datadir}/%{name} >/dev/null - -# Byte compile and install modules -py_modules= -for file in *.py ; do - if [ -n "$py_modules" ] ; then - py_modules="$py_modules," - fi - py_modules="$py_modules '${file%*.py}'" -done -%define setup %{__python} -c "from distutils.core import setup; setup(py_modules=[$py_modules])" -%{setup} build -%{setup} install - -# Install the prebuilt extensions by hand -python_sitelib=$(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") -install -m 755 *.so "$python_sitelib"/ - -popd - - -%preun python -# 0 = erase, 1 = upgrade -if [ $1 -eq 0 ] ; then - python_sitelib=$(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()") - pushd %{_datadir}/%{name} >/dev/null - for file in *.py *.so ; do - rm -f "$python_sitelib"/${file}* - done - popd -fi - - -%files python -%{_datadir}/%{name} +%files python -f %name-python.list %{_sbindir}/bwlimit %{_sbindir}/disklimit +%{python_sitearch}/vserverimpl.so %changelog +* Wed Oct 03 2007 Daniel Hokka Zakrisson +- build python code as part of the regular build process + +* Mon Jul 30 2007 Daniel Hokka Zakrisson +- add vip6-autod + +* Mon Jun 25 2007 Daniel Hokka Zakrisson - 0.30.214-0 +- updated URLs +- get rid of e2fsprogs requirement + * Fri Dec 29 2006 Daniel Hokka Zakrisson - 0.30.213-0 - add --with legacy and --without doc switches - add util-vserver initscript