rpms/util-vserver/devel util-vserver.spec, 1.3, 1.4 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4
Enrico Scholz (ensc)
fedora-extras-commits at redhat.com
Thu Mar 24 15:16:19 UTC 2005
Author: ensc
Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6631
Modified Files:
util-vserver.spec sources .cvsignore
Log Message:
version 0.30.205
Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- util-vserver.spec 5 Mar 2005 19:55:54 -0000 1.3
+++ util-vserver.spec 24 Mar 2005 15:16:17 -0000 1.4
@@ -3,23 +3,26 @@
## This package understands the following switches:
## --without dietlibc ... disable usage of dietlibc
## --without xalan ... do not require/use the xalan xslt processor
+## --with xalan ... require/use the xalan xslt processor
## Fedora Extras specific customization below...
-%{!?release_func:%define release_func() %1}
+%{!?_with_xalan:%global _without_xalan --without xalan}
##
+%global confdir %_sysconfdir/vservers
+%global confdefaultdir %confdir/.defaults
+%global pkglibdir %_libdir/%name
+%global __chattr /usr/bin/chattr
+%global chkconfig /sbin/chkconfig
-%define confdir %_sysconfdir/vservers
-%define confdefaultdir %confdir/.defaults
-%define pkglibdir %_libdir/%name
-%define __chattr /usr/bin/chattr
-%define chkconfig /sbin/chkconfig
+%global _localstatedir %_var
-%define _localstatedir %_var
+
+%{!?release_func:%global release_func() %1%{?disttag}}
Summary: Linux virtual server utilities
Name: util-vserver
-Version: 0.30.203
+Version: 0.30.205
Release: %release_func 1
License: GPL
Group: System Environment/Base
@@ -35,12 +38,12 @@
Obsoletes: vserver < %version
BuildRequires: mount vconfig gawk iproute iptables
BuildRequires: gcc-c++ wget
-BuildRequires: e2fsprogs-devel
+BuildRequires: e2fsprogs-devel beecrypt-devel
BuildRequires: doxygen tetex-latex
Requires(post): %__chattr
Requires(pre): %pkglibdir
Requires(postun): %pkglibdir
-%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.24}
+%{!?_without_dietlibc:BuildRequires: dietlibc >= 0:0.25}
%{!?_without_xalan:BuildRequires: xalan-j}
%package lib
@@ -88,7 +91,7 @@
%description
-This package provides the components and a framework to setup virtual
+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
@@ -98,11 +101,66 @@
set_ipv4root system call.
%description lib
+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 the shared libraries needed by all other
+'util-vserver' subpackages.
+
%description core
+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 utilities which are required to communicate with
+the Linux-Vserver enabled kernel.
+
+
%description build
+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 utilities which assist in building Vservers.
+
%description sysv
+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 the SysV initscripts which start and stop
+VServers and related tools.
+
+
%description legacy
+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 the tools which are needed to work with VServers
+having an old-style configuration.
+
+
%description devel
+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 header files and libraries which are needed to
+develop VServer related applications.
%prep
@@ -167,6 +225,26 @@
test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || :
+%triggerin build -- fedora-release
+function copy()
+{
+ base=$1
+ shift
+
+ for i; do
+ test -r "$i" || continue
+
+ target=%confdir/.distributions/.common/pubkeys/$base-$(basename "$i")
+ cp -a "$i" "$target"
+ done
+}
+copy fedora /usr/share/doc/fedora-release-*/RPM-GPG-*
+
+
+%preun build
+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.
@@ -233,6 +311,10 @@
%dir %confdir/.distributions
%dir %confdir/.distributions/*
%dir %confdir/.distributions/*/apt
+%dir %confdir/.distributions/.common
+%dir %confdir/.distributions/.common/pubkeys
+%dir %confdefaultdir/apps/vunify
+%dir %confdefaultdir/apps/vunify/hash
%files legacy -f %name-legacy.list
@@ -247,6 +329,15 @@
%changelog
+* Thu Mar 24 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.30.205-1
+- added some %%descriptions
+- copy GPG keys from the system into the confdir
+- buildrequire dietlibc-0.25
+- BuildRequire beecrypt-devel
+- cleanups
+- use %%global instead of %%define
+- removed 'run.rev' as a vserver-local variable and made it a system-wide setting
+
* Wed Jan 26 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0:0.30.198-0.3
- updated BuildRequires:
- use 'setattr --barrier' instead of 'chattr +t' in the %post scriptlet
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 3 Feb 2005 00:54:37 -0000 1.3
+++ sources 24 Mar 2005 15:16:17 -0000 1.4
@@ -1,2 +1,2 @@
-205bed0babe0f64ce9073c5c15a3b8bb util-vserver-0.30.203.tar.bz2
-1d8e15b81d7cc3d845851ce53c4ff433 util-vserver-0.30.203.tar.bz2.asc
+9d509327744fd5dfa84faa68531853c3 util-vserver-0.30.205.tar.bz2
+ce1b9390e89c332eec280a27883a6b46 util-vserver-0.30.205.tar.bz2.asc
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 3 Feb 2005 00:53:05 -0000 1.3
+++ .cvsignore 24 Mar 2005 15:16:17 -0000 1.4
@@ -1 +1,4 @@
-util-vserver*.tar.bz2*
+util-vserver*.tar.bz2
+util-vserver*.tar.bz2.asc
+i386
+util-vserver*.src.rpm
More information about the fedora-extras-commits
mailing list