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

[ensc]

Author: ensc

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

Modified Files:
	util-vserver.spec 
Log Message:
revert last two commits


Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- util-vserver.spec	2 Jun 2010 17:50:07 -0000	1.53
+++ util-vserver.spec	2 Jun 2010 19:26:34 -0000	1.54
@@ -6,9 +6,9 @@
 
 %ifarch ppc64
 ## fails because '__sigsetjmp' and '__longjmp' are undefined
-%bcond_with             dietlibc
+%bcond_with		dietlibc
 %else
-%bcond_without          dietlibc
+%bcond_without		dietlibc
 %endif
 
 %bcond_with		xalan
@@ -28,7 +28,7 @@
 Summary:	Linux virtual server utilities
 Name:		util-vserver
 Version:	0.30.215+svn2847
-Release:	%release_func 143596527
+Release:	%release_func 143596525
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -47,7 +47,6 @@ 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
@@ -191,13 +190,14 @@ 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
@@ -209,10 +209,7 @@ 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%{_libdir}/*.a
-
-sed -i "s|devel  %{_libdir}/libvserver.a||" contrib/manifest.dat
+      $RPM_BUILD_ROOT%python_sitearch/*.*a
 
 MANIFEST_CONFIG='%config' \
 MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \
@@ -220,10 +217,8 @@ 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
@@ -390,14 +385,6 @@ 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)
-- 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