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

[ensc]

Author: ensc

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

Modified Files:
	util-vserver.spec 
Log Message:
- updated to svn2893 snapshot
- splitted static libs out of -devel into own subpackage
- added some BRs (thx to Tom "spot" Callaway)
- added %%{?_isa} annotations to some Requires:
- removed a very old workaround



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- util-vserver.spec	2 Jun 2010 19:26:34 -0000	1.54
+++ util-vserver.spec	2 Jun 2010 22:34:51 -0000	1.55
@@ -22,13 +22,12 @@
 %global _localstatedir	%_var
 
 %{!?python_sitearch:%global python_sitearch %(%__python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-
-%{!?release_func:%global release_func() %1%{?dist}}
+%{!?release_func:%global release_func() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}}
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.215+svn2847
-Release:	%release_func 143596525
+Version:	0.30.215+svn2893
+Release:	%release_func 1400
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
@@ -37,8 +36,8 @@ Source0:	http://ftp.linux-vserver.org/pu
 
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
-Requires:	%name-core = %version-%release
-Requires:	%name-lib  = %version-%release
+Requires:	%name-core%{?_isa} = %version-%release
+Requires:	%name-lib%{?_isa}  = %version-%release
 Requires:	diffutils mktemp sed
 Provides:	vserver = %version-%release
 Obsoletes:	vserver < %version
@@ -47,6 +46,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
@@ -96,13 +96,19 @@ requires(postun):	%_initrddir %pkglibdir
 Summary:		Header-files and libraries needed to develop vserver based applications
 Group:			Development/Libraries
 Requires:		pkgconfig
-Requires:		%name-lib = %version-%release
+Requires:		%name-lib%{?_isa} = %version-%release
+
+%package static
+Summary:		Static libraries needed to develop vserver based applications
+Group:			Development/Libraries
+Requires:		pkgconfig
+Requires:		%name-lib%{?_isa} = %version-%release
 
 %package python
 Summary:		Python bindings to develop vserver-based applications
 Group:			Development/Libraries
 BuildRequires:		python-devel ctags
-Requires:		%name-lib = %version-%release
+Requires:		%name-lib%{?_isa} = %version-%release
 
 
 %description
@@ -177,6 +183,17 @@ can't interact with services in the main
 This package contains header files and libraries which are needed to
 develop VServer related applications.
 
+
+%description static
+util-vserver provides the components and a framework to setup virtual
+servers.  A virtual server runs inside a linux server. It is nevertheless
+highly independent. As such, you can run various services with normal
+configuration. The various vservers can't interact with each other and
+can't interact with services in the main server.
+
+This package contains static libraries which are needed to develop
+VServer related applications.
+
 %description python
 util-vserver provides the components and a framework to setup virtual
 servers.  A virtual server runs inside a linux server. It is nevertheless
@@ -293,17 +310,6 @@ f="%confdefaultdir/apps/vunify/hash"; te
 test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-*
 
 
-## Temporary workaround to remove old v_* files; it will conflict
-## somehow with the -legacy package but can be fixed by reinstalling
-## this package.
-## TODO: remove me in the final .spec file
-%define v_services	httpd named portmap sendmail smb sshd xinetd gated
-%triggerun sysv -- util-vserver-sysv < 0.30.198
-for i in %v_services; do
-	%chkconfig --del v_$i || :
-done
-
-
 %post legacy
 %chkconfig --add rebootmgr
 %chkconfig --add vservers-legacy
@@ -312,7 +318,6 @@ for i in %v_services; do
 	%chkconfig --add v_$i
 done
 
-
 %preun legacy
 test "$1" != 0 || %_initrddir/rebootmgr   stop &>/dev/null || :
 
@@ -378,13 +383,28 @@ test "$1" = 0  || %_initrddir/rebootmgr 
 %doc lib/apidoc/latex/refman.pdf
 %doc lib/apidoc/html
 
+%exclude %_libdir/*.a
+
+
+%files static
+%defattr(-,root,root,-)
+%_libdir/*.a
+
 
 %files python
 %defattr(-,root,root,-)
 %python_sitearch/*.so
+%python_sitearch/*.py*
 
 
 %changelog
+* Thu Jun  3 2010 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.215+svn2893-1400
+- updated to svn2893 snapshot
+- splitted static libs out of -devel into own subpackage
+- added some BRs (thx to Tom "spot" Callaway)
+- added %%{?_isa} annotations to some Requires:
+- removed a very old workaround
+
 * 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