enable dietlibc again, disable tests, forcibly remove static lib

This commit is contained in:
Tom Callaway 2010-06-02 17:50:07 +00:00
commit f8bd46a7de

View file

@ -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_ROOT contrib/manifest.dat
%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 condrestart >/dev/null || :
%changelog
* Wed Jun 2 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 0.30.215+svn2847-143596527
- enable dietlibc again, but disable tests
* Wed Jun 2 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 0.30.215+svn2847-143596526
- do not package static libs
- disable dietlibc by default (tests fail to build with dietlibc enabled)