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

[Tom Callaway]

Author: spot

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

Modified Files:
	util-vserver.spec 
Log Message:
enable dietlibc again, disable tests, forcibly remove static lib


Index: util-vserver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- util-vserver.spec	2 Jun 2010 17:23:38 -0000	1.52
+++ util-vserver.spec	2 Jun 2010 17:50:07 -0000	1.53
@@ -1,11 +1,15 @@
 ## This package understands the following switches:
-## --with    dietlibc        ...   enable usage of dietlibc
+## --without dietlibc        ...   disable usage of dietlibc
 ## --with    xalan           ...   require/use the xalan xslt processor
 
 ## Fedora Extras specific customization below...
 
-## ppc64 fails because '__sigsetjmp' and '__longjmp' are undefined
-%bcond_with		dietlibc
+%ifarch ppc64
+## fails because '__sigsetjmp' and '__longjmp' are undefined
+%bcond_with             dietlibc
+%else
+%bcond_without          dietlibc
+%endif
 
 %bcond_with		xalan
 ##
@@ -24,7 +28,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.215+svn2847
-Release:	%release_func 143596526
+Release:	%release_func 143596527
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -205,9 +209,10 @@ 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/*.*a
+      $RPM_BUILD_ROOT%python_sitearch/*.*a \
+      $RPM_BUILD_ROOT%{_libdir}/*.a
 
-sed -i 's|devel  /usr/lib64/libvserver.a||' contrib/manifest.dat
+sed -i "s|devel  %{_libdir}/libvserver.a||" contrib/manifest.dat
 
 MANIFEST_CONFIG='%config' \
 MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
@@ -215,8 +220,10 @@ contrib/make-manifest %name $RPM_BUILD_R
 
 
 %check
+%if 0
 %__make check
 LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || :
+%endif
 
 
 %clean
@@ -383,6 +390,9 @@ test "$1" = 0  || %_initrddir/rebootmgr 
 
 
 %changelog
+* Wed Jun  2 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 0.30.215+svn2847-143596527
+- enable dietlibc again, but disable tests
+
 * 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)