X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec.in;h=2f47ef882a72019c9e8685fda9a574f4c15fd41e;hb=272cd65d97715143f588744100419e827bbe494a;hp=bfdb14fd10707ebe30d7cd1ddacfdf7beae95ce7;hpb=225e5c693e17be8a1562f0885286217ca2b322e3;p=util-vserver.git

diff --git a/util-vserver.spec.in b/util-vserver.spec.in
index bfdb14f..2f47ef8 100644
--- a/util-vserver.spec.in
+++ b/util-vserver.spec.in
@@ -30,7 +30,7 @@ URL: http://cvs.planet-lab.org/cvs/util-vserver
 Summary:	Linux virtual server utilities
 Name:		@PACKAGE@
 Version:	@VERSION@
-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,15 @@ 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/python@PYTHON_VERSION@/site-packages/*
 
 
 %changelog
+* 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