rpms/util-vserver/devel util-vserver.spec,1.51,1.52

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/util-vserver/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21737

Modified Files:
	util-vserver.spec 
Log Message:
disable static libs, disable dietlibc by default to get package building again


Index: util-vserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- util-vserver.spec	23 Aug 2009 13:43:37 -0000	1.51
+++ util-vserver.spec	2 Jun 2010 17:23:38 -0000	1.52
@@ -1,15 +1,11 @@
 ## This package understands the following switches:
-## --without dietlibc        ...   disable usage of dietlibc
+## --with    dietlibc        ...   enable usage of dietlibc
 ## --with    xalan           ...   require/use the xalan xslt processor
 
 ## Fedora Extras specific customization below...
 
-%ifarch ppc64
-## fails because '__sigsetjmp' and '__longjmp' are undefined
+## ppc64 fails because '__sigsetjmp' and '__longjmp' are undefined
 %bcond_with		dietlibc
-%else
-%bcond_without		dietlibc
-%endif
 
 %bcond_with		xalan
 ##
@@ -28,7 +24,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.215+svn2847
-Release:	%release_func 143596525
+Release:	%release_func 143596526
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -47,6 +43,7 @@ BuildRequires:	gcc-c++ wget which diffut
 BuildRequires:	e2fsprogs-devel nss-devel
 BuildRequires:	doxygen tetex-latex graphviz ghostscript
 BuildRequires:	libxslt rsync dump
+BuildRequires:	procps module-init-tools net-tools
 Requires(post):		%name-core
 Requires(pre):		%pkglibdir
 Requires(postun):	%pkglibdir
@@ -190,14 +187,13 @@ Linux-VServer API from Python.
 
 %prep
 %setup -q
-
 sed -i -e 's!^\(# chkconfig: \)[0-9]\+ !\1- !' sysv/*
 
-
 %build
 %configure --with-initrddir=%_initrddir --enable-release \
 	   --with-crypto-api=nss \
 	   --with-python \
+	   --disable-static \
 	   %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc
 
 %__make %{?_smp_mflags} all
@@ -211,6 +207,8 @@ rm -rf $RPM_BUILD_ROOT
 rm -f $RPM_BUILD_ROOT%_libdir/*.la \
       $RPM_BUILD_ROOT%python_sitearch/*.*a
 
+sed -i 's|devel  /usr/lib64/libvserver.a||' contrib/manifest.dat
+
 MANIFEST_CONFIG='%config' \
 MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
 contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat
@@ -385,6 +383,11 @@ test "$1" = 0  || %_initrddir/rebootmgr 
 
 
 %changelog
+* Wed Jun  2 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.30.215+svn2847-143596526
+- do not package static libs
+- disable dietlibc by default (tests fail to build with dietlibc enabled)
+- add missing BuildRequires
+
 * Sun Aug 23 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.215+svn2847-0
 - updated to svn 2847 snapshot
 - added -python subpackage