From 9f5cc36d25272b8dedee4c951ec07cc2071c4b95 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:24:00 +0000 Subject: [PATCH 01/22] Initialize branch F-13 for util-vserver --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From cc691703d8164b75342728f87d3e1fbd533c5f8e Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 2 Jun 2010 17:23:38 +0000 Subject: [PATCH 02/22] disable static libs, disable dietlibc by default to get package building again --- util-vserver.spec | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index c1adb87..17fc2d0 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,15 +1,11 @@ ## This package understands the following switches: -## --without dietlibc ... disable usage of dietlibc +## --with dietlibc ... enable usage of dietlibc ## --with xalan ... require/use the xalan xslt processor ## Fedora Extras specific customization below... -%ifarch ppc64 -## fails because '__sigsetjmp' and '__longjmp' are undefined +## ppc64 fails because '__sigsetjmp' and '__longjmp' are undefined %bcond_with dietlibc -%else -%bcond_without dietlibc -%endif %bcond_with xalan ## @@ -28,7 +24,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2847 -Release: %release_func 143596525 +Release: %release_func 143596526 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -47,6 +43,7 @@ BuildRequires: gcc-c++ wget which diffutils 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 @@ -190,14 +187,13 @@ 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 @@ -211,6 +207,8 @@ rm -rf $RPM_BUILD_ROOT rm -f $RPM_BUILD_ROOT%_libdir/*.la \ $RPM_BUILD_ROOT%python_sitearch/*.*a +sed -i 's|devel /usr/lib64/libvserver.a||' contrib/manifest.dat + MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat @@ -385,6 +383,11 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Wed Jun 2 2010 Tom "spot" Callaway - 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 - 0.30.215+svn2847-0 - updated to svn 2847 snapshot - added -python subpackage From f8bd46a7de77d186fd72ce1908c7e1cbb8a26404 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 2 Jun 2010 17:50:07 +0000 Subject: [PATCH 03/22] enable dietlibc again, disable tests, forcibly remove static lib --- util-vserver.spec | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 17fc2d0..b696cab 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -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 - 0.30.215+svn2847-143596527 +- enable dietlibc again, but disable tests + * Wed Jun 2 2010 Tom "spot" Callaway - 0.30.215+svn2847-143596526 - do not package static libs - disable dietlibc by default (tests fail to build with dietlibc enabled) From 628058bfe3528e279abbcbff8ffb7bb34cc61fda Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 2 Jun 2010 19:26:34 +0000 Subject: [PATCH 04/22] revert last two commits --- util-vserver.spec | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index b696cab..c1adb87 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -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 diffutils 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_ROOT contrib/manifest.dat %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 condrestart >/dev/null || : %changelog -* Wed Jun 2 2010 Tom "spot" Callaway - 0.30.215+svn2847-143596527 -- enable dietlibc again, but disable tests - -* Wed Jun 2 2010 Tom "spot" Callaway - 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 - 0.30.215+svn2847-0 - updated to svn 2847 snapshot - added -python subpackage From 0baa93331325e04bc89f8edd115031b414256b2f Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 2 Jun 2010 19:49:37 +0000 Subject: [PATCH 05/22] use $(CVS), not cvs --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ccf7583..4bde95a 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,10 @@ # Makefile for source rpm: util-vserver NAME := util-vserver SPECFILE = $(firstword $(wildcard *.spec)) +CVS ?= cvs define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; $(CVS) -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9dd1e7a330c83ce3891346df9cc060f9e138e24d Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 2 Jun 2010 22:34:51 +0000 Subject: [PATCH 06/22] - 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 --- util-vserver.spec | 60 +++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 20 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index c1adb87..9a5aab5 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -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/pub/utils/util-vserver/%name-%version.tar. 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 diffutils 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 server. 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"; test -e "$f"/method -o -e "$f"/00 || \ 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 condrestart >/dev/null || : %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 - 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 - 0.30.215+svn2847-0 - updated to svn 2847 snapshot - added -python subpackage From afb494ba47799bf47ee618c59acd05c33290baf6 Mon Sep 17 00:00:00 2001 From: ensc Date: Wed, 2 Jun 2010 22:35:25 +0000 Subject: [PATCH 07/22] - updated to svn2893 snapshot --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 45b3057..59e718b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -util-vserver-0.30.215+svn2847.tar.bz2 +util-vserver-0.30.215+svn2893.tar.bz2 diff --git a/sources b/sources index 0956717..fa27c59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5682ed047a44d8e027bd780fc43cf982 util-vserver-0.30.215+svn2847.tar.bz2 +4687024e1374ba2a4044240fd71f0804 util-vserver-0.30.215+svn2893.tar.bz2 From c6488b327ba4a315dd1af9759407cea093f664b8 Mon Sep 17 00:00:00 2001 From: dmalcolm Date: Thu, 22 Jul 2010 07:08:23 +0000 Subject: [PATCH 08/22] - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 9a5aab5..9e870ca 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -27,7 +27,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2893 -Release: %release_func 1400 +Release: %release_func 1401 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -398,6 +398,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Thu Jul 22 2010 David Malcolm - 0.30.215+svn2893-1401 +- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild + * Thu Jun 3 2010 Enrico Scholz - 0.30.215+svn2893-1400 - updated to svn2893 snapshot - splitted static libs out of -devel into own subpackage From d1d29bc57fc362178738282bf0fb799e3159c0b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:50:26 +0000 Subject: [PATCH 09/22] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 20 -------------------- branch | 1 - 3 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ccf7583..0000000 --- a/Makefile +++ /dev/null @@ -1,20 +0,0 @@ -# Makefile for source rpm: util-vserver -NAME := util-vserver -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13 From eba74e56a8df9df4ce639d13c555464d9b1fb59b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:50:37 +0000 Subject: [PATCH 10/22] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 4bde95a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: util-vserver -NAME := util-vserver -SPECFILE = $(firstword $(wildcard *.spec)) -CVS ?= cvs - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; $(CVS) -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From 6cd3301367b27aa10e200f1f8706a51b0e42a695 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 16 Aug 2010 00:07:54 +0200 Subject: [PATCH 11/22] readded makefile --- Makefile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e5461e3 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +MAKEFILE_COMMON = $(HOME)/.fedora/common.mk +-include $(MAKEFILE_COMMON) From b94e4934852babaafce79266c7eca9d0b123a3ac Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Mon, 16 Aug 2010 00:08:09 +0200 Subject: [PATCH 12/22] readded makefile --- Makefile | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..e5461e3 --- /dev/null +++ b/Makefile @@ -0,0 +1,2 @@ +MAKEFILE_COMMON = $(HOME)/.fedora/common.mk +-include $(MAKEFILE_COMMON) From fa50699bfb38eff61c8517e2d4b3a2d481920447 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 24 Dec 2010 14:42:52 +0100 Subject: [PATCH 13/22] updated to svn 2929 snapshot --- .gitignore | 1 + sources | 2 +- util-vserver.spec | 7 +++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 59e718b..95908a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ util-vserver-0.30.215+svn2893.tar.bz2 +/util-vserver-0.30.215+svn2929.tar.bz2 diff --git a/sources b/sources index fa27c59..fd9d2ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4687024e1374ba2a4044240fd71f0804 util-vserver-0.30.215+svn2893.tar.bz2 +993b02c69f3937b772887da31fa6a363 util-vserver-0.30.215+svn2929.tar.bz2 diff --git a/util-vserver.spec b/util-vserver.spec index 9e870ca..f9d79e9 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -26,8 +26,8 @@ Summary: Linux virtual server utilities Name: util-vserver -Version: 0.30.215+svn2893 -Release: %release_func 1401 +Version: 0.30.215+svn2929 +Release: %release_func 1500 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -398,6 +398,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Fri Dec 24 2010 Enrico Scholz - 0.30.215+svn2929-1500 +- updated to svn 2929 snapshot + * Thu Jul 22 2010 David Malcolm - 0.30.215+svn2893-1401 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From d2afe8d76cf5e3f21deeb7be32e610eaf19d1561 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Fri, 24 Dec 2010 15:53:32 +0100 Subject: [PATCH 14/22] added tmpfiles.d/ descriptions --- util-vserver.spec | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index f9d79e9..db31f37 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -12,6 +12,7 @@ %endif %bcond_with xalan +%bcond_without tmpfiles ## %global confdir %_sysconfdir/vservers @@ -232,6 +233,16 @@ MANIFEST_CONFIG='%config' \ MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat +install -d -m 0755 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d +cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf +-d %_localstatedir/run/vservers 0755 root root +-d %_localstatedir/run/vservers.rev 0755 root root +-d %_localstatedir/run/vshelper 0755 root root +EOF + + +%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} + %check %__make check @@ -347,10 +358,17 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %ghost %confdefaultdir/run.rev %dir %_localstatedir/cache/vservers -%dir %_localstatedir/run/vservers -%dir %_localstatedir/run/vservers.rev -%dir %_localstatedir/run/vshelper +%if 0%{?with_tmpfiles:1} + %_sysconfdir/tmpfiles.d/%name.conf + %ghost %dir %_localstatedir/run/vservers + %ghost %dir %_localstatedir/run/vservers.rev + %ghost %dir %_localstatedir/run/vshelper +%else + %dir %_localstatedir/run/vservers + %dir %_localstatedir/run/vservers.rev + %dir %_localstatedir/run/vshelper +%endif %files lib -f %name-lib.list %files sysv -f %name-sysv.list @@ -400,6 +418,7 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog * Fri Dec 24 2010 Enrico Scholz - 0.30.215+svn2929-1500 - updated to svn 2929 snapshot +- added tmpfiles.d/ descriptions * Thu Jul 22 2010 David Malcolm - 0.30.215+svn2893-1401 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild From 873325e32908202dd558679467b71ed9b9a47aac Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 18:46:25 -0600 Subject: [PATCH 15/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index db31f37..7408141 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1500 +Release: %release_func 1501 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Mon Feb 07 2011 Fedora Release Engineering - 0.30.215+svn2929-1501 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Fri Dec 24 2010 Enrico Scholz - 0.30.215+svn2929-1500 - updated to svn 2929 snapshot - added tmpfiles.d/ descriptions From 52ff05b4dd6f33055ba375fdd2590c230ebf7a8e Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sun, 20 Feb 2011 18:41:28 +0100 Subject: [PATCH 16/22] removed 'mount' BR --- util-vserver.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 7408141..8fe47f9 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1501 +Release: %release_func 1600 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -42,7 +42,7 @@ Requires: %name-lib%{?_isa} = %version-%release Requires: diffutils mktemp sed Provides: vserver = %version-%release Obsoletes: vserver < %version -BuildRequires: mount vconfig gawk iproute iptables +BuildRequires: vconfig gawk iproute iptables BuildRequires: gcc-c++ wget which diffutils BuildRequires: e2fsprogs-devel nss-devel BuildRequires: doxygen tetex-latex graphviz ghostscript @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sun Feb 20 2011 Enrico Scholz - 0.30.215+svn2929-1600 +- removed 'mount' BR + * Mon Feb 07 2011 Fedora Release Engineering - 0.30.215+svn2929-1501 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From e94872f4ac01bb795899f057da1c9fd4e9e6ca37 Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Sat, 23 Apr 2011 14:45:51 +0200 Subject: [PATCH 17/22] fixed tmpfiles.d syntax --- util-vserver.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/util-vserver.spec b/util-vserver.spec index 8fe47f9..6c608ba 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1600 +Release: %release_func 1601 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -235,9 +235,9 @@ contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat install -d -m 0755 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf --d %_localstatedir/run/vservers 0755 root root --d %_localstatedir/run/vservers.rev 0755 root root --d %_localstatedir/run/vshelper 0755 root root +d %_localstatedir/run/vservers 0755 root root +d %_localstatedir/run/vservers.rev 0755 root root +d %_localstatedir/run/vshelper 0755 root root EOF @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Apr 23 2011 Enrico Scholz - 0.30.215+svn2929-1601 +- fixed tmpfiles.d syntax + * Sun Feb 20 2011 Enrico Scholz - 0.30.215+svn2929-1600 - removed 'mount' BR From 5b225a60d5967ac5d9e0529a6718cbd15bfd218f Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 11 Jan 2012 10:46:59 +0000 Subject: [PATCH 18/22] mktemp was long obsoleted by coreutils --- util-vserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 6c608ba..24b933f 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -39,7 +39,7 @@ BuildRoot: %_tmppath/%name-%version-%release-root Requires: init(%name) Requires: %name-core%{?_isa} = %version-%release Requires: %name-lib%{?_isa} = %version-%release -Requires: diffutils mktemp sed +Requires: diffutils coreutils sed Provides: vserver = %version-%release Obsoletes: vserver < %version BuildRequires: vconfig gawk iproute iptables From 6a0263a8525022d79771fee71285399314ff667f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 01:41:53 -0600 Subject: [PATCH 19/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 24b933f..8cf32a0 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1601 +Release: %release_func 1602 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 0.30.215+svn2929-1602 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Sat Apr 23 2011 Enrico Scholz - 0.30.215+svn2929-1601 - fixed tmpfiles.d syntax From 4f45f5c675a641174761273f86873a4ff9b75b35 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 21 Jul 2012 21:14:46 -0500 Subject: [PATCH 20/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 8cf32a0..95b9b86 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1602 +Release: %release_func 1603 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Sun Jul 22 2012 Fedora Release Engineering - 0.30.215+svn2929-1603 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Sat Jan 14 2012 Fedora Release Engineering - 0.30.215+svn2929-1602 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 5ed607c88d0bafc6e3f6b4f8a6e404173cf6b7b7 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 20:35:11 -0600 Subject: [PATCH 21/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- util-vserver.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/util-vserver.spec b/util-vserver.spec index 95b9b86..8813291 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -28,7 +28,7 @@ Summary: Linux virtual server utilities Name: util-vserver Version: 0.30.215+svn2929 -Release: %release_func 1603 +Release: %release_func 1604 License: GPLv2 Group: System Environment/Base URL: http://savannah.nongnu.org/projects/util-vserver/ @@ -416,6 +416,9 @@ test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : %changelog +* Fri Feb 15 2013 Fedora Release Engineering - 0.30.215+svn2929-1604 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sun Jul 22 2012 Fedora Release Engineering - 0.30.215+svn2929-1603 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 4e6c1bcb6e79d7f1cccc1aaba3817d7ecb09e2e9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 12 Mar 2013 00:25:37 -0400 Subject: [PATCH 22/22] Retire util-vserver - no maintainer --- Makefile | 2 - dead.package | 1 + lastver | 1 - sources | 1 - util-vserver.spec | 610 ---------------------------------------------- verinfo | 2 - 6 files changed, 1 insertion(+), 616 deletions(-) delete mode 100644 Makefile create mode 100644 dead.package delete mode 100644 lastver delete mode 100644 sources delete mode 100644 util-vserver.spec delete mode 100644 verinfo diff --git a/Makefile b/Makefile deleted file mode 100644 index e5461e3..0000000 --- a/Makefile +++ /dev/null @@ -1,2 +0,0 @@ -MAKEFILE_COMMON = $(HOME)/.fedora/common.mk --include $(MAKEFILE_COMMON) diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5e32ab9 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package was retired on 2013-03-11 due to a lack of a willing Fedora maintainer. diff --git a/lastver b/lastver deleted file mode 100644 index 1790a0f..0000000 --- a/lastver +++ /dev/null @@ -1 +0,0 @@ -0.30.215 diff --git a/sources b/sources deleted file mode 100644 index fd9d2ce..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -993b02c69f3937b772887da31fa6a363 util-vserver-0.30.215+svn2929.tar.bz2 diff --git a/util-vserver.spec b/util-vserver.spec deleted file mode 100644 index 8813291..0000000 --- a/util-vserver.spec +++ /dev/null @@ -1,610 +0,0 @@ -## This package understands the following switches: -## --without dietlibc ... disable usage of dietlibc -## --with xalan ... require/use the xalan xslt processor - -## Fedora Extras specific customization below... - -%ifarch ppc64 -## fails because '__sigsetjmp' and '__longjmp' are undefined -%bcond_with dietlibc -%else -%bcond_without dietlibc -%endif - -%bcond_with xalan -%bcond_without tmpfiles -## - -%global confdir %_sysconfdir/vservers -%global confdefaultdir %confdir/.defaults -%global pkglibdir %_libdir/%name -%global chkconfig /sbin/chkconfig - -%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() %%{?prerelease:0.}%1%%{?prerelease:.%%prerelease}%%{?dist}} - -Summary: Linux virtual server utilities -Name: util-vserver -Version: 0.30.215+svn2929 -Release: %release_func 1604 -License: GPLv2 -Group: System Environment/Base -URL: http://savannah.nongnu.org/projects/util-vserver/ -Source0: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2 -#Source1: http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc - -BuildRoot: %_tmppath/%name-%version-%release-root -Requires: init(%name) -Requires: %name-core%{?_isa} = %version-%release -Requires: %name-lib%{?_isa} = %version-%release -Requires: diffutils coreutils sed -Provides: vserver = %version-%release -Obsoletes: vserver < %version -BuildRequires: vconfig gawk iproute iptables -BuildRequires: gcc-c++ wget which diffutils -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 -%{?with_dietlibc:BuildRequires: dietlibc} -%{?with_xalan:BuildRequires: xalan-j} - -%package lib -Summary: Dynamic libraries for util-vserver -Group: System Environment/Libraries - -%package core -Summary: The core-utilities for util-vserver -Group: Applications/System -Requires: util-linux - -%package build -Summary: Tools which can be used to build vservers -Group: Applications/System -Requires: rpm wget binutils tar -Requires: %name = %version-%release -Requires(pre): %confdir -Requires(postun): %confdir -Requires(post): %name-core - -%package sysv -Summary: SysV-initscripts for vserver -Group: System Environment/Base -Provides: init(%name) = sysv -Requires: make diffutils -Requires: initscripts -Requires: %name = %version-%release -Requires(post): %chkconfig -Requires(preun): %chkconfig -Requires(pre): %_initrddir %pkglibdir -requires(postun): %_initrddir %pkglibdir - -%package legacy -Summary: Legacy utilities for util-vserver -Group: Applications/System -Requires: %name = %version-%release -Requires(post): %chkconfig -Requires(preun): %chkconfig -Requires(pre): %_initrddir %pkglibdir -requires(postun): %_initrddir %pkglibdir - -%package devel -Summary: Header-files and libraries needed to develop vserver based applications -Group: Development/Libraries -Requires: pkgconfig -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%{?_isa} = %version-%release - - -%description -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 requires a special kernel supporting the new new_s_context and -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. - - -%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 -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 files needed to interface with the -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 \ - %{!?with_dietlibc:--disable}%{?with_dietlibc:--enable}-dietlibc - -%__make %{?_smp_mflags} all -%__make %{?_smp_mflags} doc - - -%install -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 - -MANIFEST_CONFIG='%config' \ -MANIFEST_CONFIG_NOREPLACE='%config(noreplace)' \ -contrib/make-manifest %name $RPM_BUILD_ROOT contrib/manifest.dat - -install -d -m 0755 $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d -cat << EOF > $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d/%name.conf -d %_localstatedir/run/vservers 0755 root root -d %_localstatedir/run/vservers.rev 0755 root root -d %_localstatedir/run/vshelper 0755 root root -EOF - - -%{!?with_tmpfiles: rm -rf $RPM_BUILD_ROOT%_sysconfdir/tmpfiles.d} - - -%check -%__make check -LC_NUMERIC=de_DE.UTF-8 ./lib_internal/testsuite/crypto-speed || : - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -test -d /vservers || mkdir -m0000 /vservers -test -d /vservers/.pkg || mkdir -m0755 /vservers/.pkg - -f="%confdefaultdir/vdirbase"; test -L "$f" -o -e "$f" || ln -s /vservers "$f" -f="%confdefaultdir/run.rev"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/run/vservers.rev "$f" -f="%confdefaultdir/cachebase"; test -L "$f" -o -e "$f" || ln -s %_localstatedir/cache/vservers "$f" - -%_sbindir/setattr --barrier /vservers /vservers/.pkg || : - - -%preun -test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || : - - -%post lib -p /sbin/ldconfig -%postun lib -p /sbin/ldconfig - - -%post sysv -%chkconfig --add vservers-default -%chkconfig --add vprocunhide -%chkconfig --add util-vserver - - -%preun sysv -test "$1" != 0 || %_initrddir/vprocunhide stop &>/dev/null || : - -test "$1" != 0 || %chkconfig --del vprocunhide -test "$1" != 0 || %chkconfig --del vservers-default -test "$1" != 0 || %chkconfig --del util-vserver - - -%postun sysv -test "$1" = 0 || %_initrddir/vprocunhide condrestart >/dev/null || : - - -%triggerin build -- fedora-release, centos-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-* -copy fedora /etc/pki/rpm-gpg/RPM-GPG-* -copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-* - - -%post build -test -d /vservers/.hash || mkdir -m0700 /vservers/.hash - -f="%confdefaultdir/apps/vunify/hash"; test -e "$f"/method -o -e "$f"/00 || \ - ln -s /vservers/.hash "$f"/00 - -%_sbindir/setattr --barrier /vservers/.hash || : - - -%preun build -test "$1" != 0 || rm -f %confdir/.distributions/.common/pubkeys/fedora-* - - -%post legacy -%chkconfig --add rebootmgr -%chkconfig --add vservers-legacy - -for i in %v_services; do - %chkconfig --add v_$i -done - -%preun legacy -test "$1" != 0 || %_initrddir/rebootmgr stop &>/dev/null || : - -test "$1" != 0 || for i in %v_services; do - %chkconfig --del v_$i -done - -test "$1" != 0 || %chkconfig --del rebootmgr -test "$1" != 0 || %chkconfig --del vservers-legacy - -%postun legacy -test "$1" = 0 || %_initrddir/rebootmgr condrestart >/dev/null || : - - -%files -f %name-base.list -%defattr(-,root,root,-) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS -%doc doc/*.html doc/*.css -/sbin/vshelper -%dir %confdir -%dir %confdefaultdir -%dir %confdefaultdir/apps -%dir %confdefaultdir/files -%dir %pkglibdir/defaults -%ghost %confdefaultdir/cachebase -%ghost %confdefaultdir/vdirbase -%ghost %confdefaultdir/run.rev - -%dir %_localstatedir/cache/vservers - -%if 0%{?with_tmpfiles:1} - %_sysconfdir/tmpfiles.d/%name.conf - %ghost %dir %_localstatedir/run/vservers - %ghost %dir %_localstatedir/run/vservers.rev - %ghost %dir %_localstatedir/run/vshelper -%else - %dir %_localstatedir/run/vservers - %dir %_localstatedir/run/vservers.rev - %dir %_localstatedir/run/vshelper -%endif - -%files lib -f %name-lib.list -%files sysv -f %name-sysv.list - - -%files core -f %name-core.list -%defattr(-,root,root,-) -%dir %pkglibdir - - -%files build -f %name-build.list -%defattr(-,root,root,-) -%doc contrib/yum*.patch -%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 -%defattr(-,root,root,-) -%dir %pkglibdir/legacy - - -%files devel -f %name-devel.list -%defattr(-,root,root,-) -%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 -* Fri Feb 15 2013 Fedora Release Engineering - 0.30.215+svn2929-1604 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 0.30.215+svn2929-1603 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Sat Jan 14 2012 Fedora Release Engineering - 0.30.215+svn2929-1602 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Sat Apr 23 2011 Enrico Scholz - 0.30.215+svn2929-1601 -- fixed tmpfiles.d syntax - -* Sun Feb 20 2011 Enrico Scholz - 0.30.215+svn2929-1600 -- removed 'mount' BR - -* Mon Feb 07 2011 Fedora Release Engineering - 0.30.215+svn2929-1501 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Dec 24 2010 Enrico Scholz - 0.30.215+svn2929-1500 -- updated to svn 2929 snapshot -- added tmpfiles.d/ descriptions - -* Thu Jul 22 2010 David Malcolm - 0.30.215+svn2893-1401 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild - -* Thu Jun 3 2010 Enrico Scholz - 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 - 0.30.215+svn2847-0 -- updated to svn 2847 snapshot -- added -python subpackage - -* Sun Jul 26 2009 Fedora Release Engineering - 0.30.215-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0.30.215-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sat Oct 18 2008 Enrico Scholz - 0.30.215-6 -- rebuilt with recent dietlibc - -* Sat Oct 18 2008 Enrico Scholz - 0.30.215-5 -- fixed build with recent rpm - -* Mon Sep 8 2008 Tom "spot" Callaway - 0.30.215-4 -- fix license tag - -* Sat Apr 19 2008 Enrico Scholz - 0.30.215-3 -- reenabled %%check - -* Mon Apr 14 2008 Alex Lancaster - 0.30.215-2 -- Temporarily disable check to get it to at least build and fix broken - dep in rawhide/F-9. - -* Sat Apr 12 2008 Enrico Scholz - 0.30.215-1 -- updated to 0.30.215 -- use nss-devel instead of beecrypt-devel as BR -- run crypto-suite benchmark in %%check -- fixed initscript runlevels (#441311) - -* Mon Feb 18 2008 Fedora Release Engineering - 0.30.214-3 -- Autorebuild for GCC 4.3 - -* Wed Sep 19 2007 Enrico Scholz - 0.30.214-2 -- fixed upgrade path from 0.30.213 to 0.30.214; rpm fails to handle when - a directory becomes a symlink. Hence, remove the 'etch' directory in - %%pre - -* Mon Sep 3 2007 Enrico Scholz - 0.30.214-1 -- updated to 0.30.214 - -* Sat Aug 4 2007 Enrico Scholz - 0.30.213-2 -- added patch to make 'vyum' work with a patched yum-3.2 - -* Thu May 31 2007 Enrico Scholz - 0.30.213-1 -- updated to 0.30.213 -- disabled dietlibc build for PPC64 -- enabled support for 'util-vserver' initscript - -* Fri Apr 20 2007 Enrico Scholz - 0.30.212-4 -- BR some tools tested by ./configure - -* Fri Jan 19 2007 David Woodhouse - 0.30.212-3 -- Build with 64KiB page size - -* Fri Jan 19 2007 David Woodhouse - 0.30.212-2 -- rebuilt with PPC support - -* Sun Dec 10 2006 Enrico Scholz - 0.30.212-1 -- updated to 0.30.212 -- updated URLs -- requires 'rsync' for -build to support new 'rsync' build method - -* Thu Oct 12 2006 Enrico Scholz - 0.30.211-2 -- added graphiz + ghostscript BR - -* Thu Oct 12 2006 Enrico Scholz - 0.30.211-1 -- updated to 0.30.211 - -* Thu Oct 05 2006 Christian Iseli 0.30.210-5 -- rebuilt for unwind info generation, broken in gcc-4.1.1-21 - -* Mon Sep 18 2006 Enrico Scholz - 0.30.210-4 -- rebuilt - -* Sun Jul 9 2006 Enrico Scholz - 0.30.210-3 -- rebuilt with dietlibc-0.30 - -* Mon Feb 20 2006 Enrico Scholz - 0.30.210-2 -- rebuilt for FC5 - -* Sun Jan 22 2006 Enrico Scholz - 0.30.210-1 -- version 0.30.210 -- removed patches which were from upstream - -* Sun Jan 22 2006 Enrico Scholz - 0.30.210-0 -- do not require 'xalan' anymore by default -- removed 'Requires: apt'; apt-rpm is not maintained upstream anymore -- removed 'chattr' leftovers -- create the '/etc/vservers/.defaults/cachebase' symlink -- added /var/cache/vservers and the needed support -- set barrier attribute on /vservers/.pkg and /vservers/.hash -- added 'centos-release' to the list of packages in the copy-the-keys - trigger script -- create '/vservers/.hash' and add initial configuration for it - -* Thu Nov 3 2005 Enrico Scholz - 0.30.209-4 -- exclude PPC from build; see - https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389 -- added patch to make 'vyum' work with yum-2.4 - -* Tue Nov 1 2005 Enrico Scholz - 0.30.209-3 -- added lot of debug stuff to find out the reason for the 'make check' - failure on PPC (cflags & personlity get killed there) - -* Sun Oct 30 2005 Enrico Scholz - 0.30.209-2 -- made sure that ensc_fmt/* it compiled with dietlibc. Else, it will - fail with the stack-protector in FC5's gcc - -* Sun Oct 30 2005 Enrico Scholz - 0:0.30.209-1 -- version 0.30.209 -- copy centos keys - -* Sat Jul 16 2005 Enrico Scholz - 0:0.30.208-2 -- updated URLs - -* Fri Jul 15 2005 Enrico Scholz - 0:0.30.208-1 -- version 0.30.208 -- require the -lib subpackage by -devel -- copy GPG keys from /etc/pki/rpm-gpg/ - -* Fri Apr 15 2005 Enrico Scholz - 0:0.30.206-1 -- added patches to make yum work in chroot environments -- version 0.30.206 - -* Thu Mar 24 2005 Enrico Scholz - 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 - 0:0.30.198-0.3 -- updated BuildRequires: -- use 'setattr --barrier' instead of 'chattr +t' in the %%post scriptlet -- moved the v_* initscripts to legacy -- do not ship the /vservers directory itself; as it is immutable, the - extraction will fail else - -* Thu Sep 9 2004 Enrico Scholz - 0:0.30.194-0 -- documented switches for 'rpmbuild' - -* Wed May 26 2004 Enrico Scholz - 0:0.29.215-0 -- (re)added the MANIFEST_* variables which were lost some time ago; - this will preserve %%config files... - -* Mon Mar 15 2004 Enrico Scholz - 0:0.29.202-0 -- use file-list for sysv scripts also - -* Sat Mar 6 2004 Enrico Scholz - 0:0.29.198-0 -- added vprocunhide-service support -- added doxygen support -- updated Requires: - -* Wed Oct 1 2003 Enrico Scholz - 0:0.23.5-0 -- Initial build. diff --git a/verinfo b/verinfo deleted file mode 100644 index b78fa74..0000000 --- a/verinfo +++ /dev/null @@ -1,2 +0,0 @@ -http://ftp.linux-vserver.org/pub/utils/util-vserver/ -util-vserver-(.*?)\.tar\.bz2