X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=util-vserver.spec;h=c0938a4949c32eb33527076c2c80cc63d2a843f9;hb=95e2774070e989fe9cf9f48dae5fa054e55e2a3e;hp=03a5e6dd0cd11e293e81222a7ca3e33b2da6bf9a;hpb=826562685ab9bff11f6a38cf19ced16bc04b293f;p=util-vserver.git

diff --git a/util-vserver.spec b/util-vserver.spec
index 03a5e6d..c0938a4 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,4 +1,5 @@
-# $Id: util-vserver.spec.in 2482 2007-01-29 23:37:07Z dhozac $
+# $Id$
+%define url $URL$
 
 ## This package understands the following switches:
 ## --without dietlibc        ...   disable usage of dietlibc
@@ -13,14 +14,16 @@
 
 %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
+%define name util-vserver
+%define version 0.30.214
+%define taglevel 1
 
+%global ver		%( echo %{version} | sed 's/-.*//' )
+%global subver		%( s=`echo %{version} | grep -- - | sed 's/.*-/./'`; echo ${s:-.1} )
+%global fullver		%{version}
 
-%define name util-vserver
-%define version 0.30.213
-%{!?release_func:%global release_func() 1%{?pldistro:.%{pldistro}}%{?date:.%{date}}}
+
+%{!?release_func:%global release_func() %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}}
 
 %global python_sitearch	%( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" )
 
@@ -32,8 +35,8 @@
 
 Vendor: PlanetLab
 Packager: PlanetLab Central <support@planet-lab.org>
-Distribution: PlanetLab 3.0
-URL: http://cvs.planet-lab.org/cvs/util-vserver
+Distribution: PlanetLab %{plrelease}
+URL: %(echo %{url} | cut -d ' ' -f 2)
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
@@ -109,7 +112,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
 
 
@@ -203,7 +206,7 @@ automake --add-missing
 %configure --with-initrddir=%_initrddir --enable-release \
            %{?_without_dietlibc:--disable-dietlibc} \
            %{!?_without_legacy:--enable-apis=NOLEGACY} \
-           --with-initscripts=sysv --disable-static=vserverimpl
+           --with-initscripts=sysv
 
 %__make %{?_smp_mflags} all
 %{!?_without_doc:%__make %{?_smp_mflags} doc}
@@ -212,7 +215,7 @@ automake --add-missing
 rm -rf $RPM_BUILD_ROOT
 %__make DESTDIR="$RPM_BUILD_ROOT" install install-distribution
 
-rm -f $RPM_BUILD_ROOT/%_libdir/*.la $RPM_BUILD_ROOT%{python_sitearch}/*.la
+rm -f $RPM_BUILD_ROOT/%_libdir/*.la $RPM_BUILD_ROOT%{python_sitearch}/*.{la,a}
 
 MANIFEST_CONFIG='%config' \
 MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
@@ -222,6 +225,9 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
 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
@@ -417,9 +423,16 @@ done
 
 
 %changelog
+* Wed Oct 03 2007 Daniel Hokka Zakrisson <daniel@hozac.com>
+- build python code as part of the regular build process
+
 * Mon Jul 30 2007 Daniel Hokka Zakrisson <daniel@hozac.com>
 - add vip6-autod
 
+* Mon Jun 25 2007 Daniel Hokka Zakrisson <daniel@hozac.com> - 0.30.214-0
+- updated URLs
+- get rid of e2fsprogs requirement
+
 * Fri Dec 29 2006 Daniel Hokka Zakrisson <daniel@hozac.com> - 0.30.213-0
 - add --with legacy and --without doc switches
 - add util-vserver initscript