Bump release number to reflect changes in vsh and vserverimpl

[util-vserver.git] / util-vserver.spec

diff --git a/util-vserver.spec b/util-vserver.spec
index 3492955..7e8fd68 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -17,7 +17,7 @@
 
 %define name util-vserver
 %define version 0.30.208
-%define release 1.planetlab%{?date:.%{date}}
+%define release 2.planetlab%{?date:.%{date}}
 
 %define _without_dietlibc 1
 %define _without_xalan 1
@@ -30,7 +30,7 @@ URL: http://cvs.planet-lab.org/cvs/util-vserver
 Summary:       Linux virtual server utilities
 Name:          util-vserver
 Version:       0.30.208
-Release:       %release_func 0
+Release:       %{release}
 License:       GPL
 Group:         System Environment/Base
 #URL:          http://savannah.nongnu.org/projects/util-vserver/
@@ -99,12 +99,11 @@ Group:                      Development/Libraries
 Requires:              pkgconfig
 Requires:              %name-lib = %version-%release
 
-%if 0
-%package py23
+%package python
 Summary:               Python modules for manipulating vservers
 Group:                 Applications/System
-Requires:              python %pkglibdir/util-vserver-vars util-python
-%endif
+Requires:              python util-python
+Obsoletes:             util-vserver-py23
 
 
 %description
@@ -180,12 +179,10 @@ This package contains header files and libraries which are needed to
 develop VServer related applications.
 
 
-%if 0
-%description py23
+%description python
 Python modules for manipulating vservers.  Provides a superset of the
 functionality of the vserver script (at least will do in the future),
 but more readily accessible from Python code.
-%endif
 
 
 %prep
@@ -202,6 +199,7 @@ automake --add-missing
 %__make %{?_smp_mflags} all
 %__make %{?_smp_mflags} doc
 
+%__make -C python
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -213,14 +211,12 @@ MANIFEST_CONFIG='%config' \
 MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
 contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
 
-%if 0
-# build python bindings
-%__make -C python INSTALL_ROOT=$RPM_BUILD_ROOT install
-%endif
+# install python bindings
+%__make -C python DESTDIR="$RPM_BUILD_ROOT" install
 
 
 %check || :
-%__make check
+#%__make check
 
 
 %clean
@@ -379,22 +375,19 @@ done
 %doc lib/apidoc/html
 
 
-%if 0
-%files py23
+%files python
 %defattr(0644,root,root)
-/usr/lib/python2.3/site-packages/bwlimit.py
-/usr/lib/python2.3/site-packages/bwlimit.pyc
-/usr/lib/python2.3/site-packages/cpulimit.py
-/usr/lib/python2.3/site-packages/cpulimit.pyc
-/usr/lib/python2.3/site-packages/util_vserver_vars.py
-/usr/lib/python2.3/site-packages/vduimpl.so
-/usr/lib/python2.3/site-packages/vserver.py
-/usr/lib/python2.3/site-packages/vserver.pyc
-/usr/lib/python2.3/site-packages/vserverimpl.so
-%endif
+%_libdir/python2.3/site-packages/*
 
 
 %changelog
+* Fri Oct  7 2005 Steve Muir <smuir@cs.princeton.edu>
+- create common function to be used for entering a vserver and applying
+  resource limits
+
+* Thu Aug 21 2005 Mark Huang <mlhuang@cs.princeton.edu>
+- restore build of python modules
+
 * Sat Aug 20 2005 Mark Huang <mlhuang@cs.princeton.edu>
 - upgrade to util-vserver-0.30.208
 - forward-port vbuild and legacy support until we can find a suitable