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

diff --git a/util-vserver.spec b/util-vserver.spec
index 03a5e6d..a136ebf 100644
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -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
 
 
@@ -203,7 +203,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 +212,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 +222,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,6 +420,9 @@ 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