rpms/util-vserver/devel util-vserver.spec, 1.15, 1.16 sources, 1.7, 1.8 util-vserver-0.30.209-yum24.patch, 1.1, NONE util-vserver-0.30.209-dietfix.patch, 1.1, NONE

Enrico Scholz (ensc) fedora-extras-commits at redhat.com
Sun Jan 22 20:08:44 UTC 2006 

Author: ensc

Update of /cvs/extras/rpms/util-vserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31426

Modified Files:
	util-vserver.spec sources 
Removed Files:
	util-vserver-0.30.209-yum24.patch 
	util-vserver-0.30.209-dietfix.patch 
Log Message:
- version 0.30.210
- removed patches which were from upstream
- 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



Index: util-vserver.spec
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/util-vserver.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- util-vserver.spec	3 Nov 2005 18:04:20 -0000	1.15
+++ util-vserver.spec	22 Jan 2006 20:08:43 -0000	1.16
@@ -2,17 +2,14 @@
 
 ## 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...
-%{!?_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
 
 %global _localstatedir	%_var
@@ -22,16 +19,13 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.209
-Release:	%release_func 4
+Version:	0.30.210
+Release:	%release_func 1
 License:	GPL
 Group:		System Environment/Base
 URL:		http://savannah.nongnu.org/projects/util-vserver/
 Source0:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2
 Source1:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc
-Patch0:		util-vserver-0.30.209-dietfix.patch
-# http://savannah.nongnu.org/cgi-bin/viewcvs/util-vserver/util-vserver/scripts/vyum-worker.diff?r1=1.5&r2=1.6
-Patch1:		util-vserver-0.30.209-yum24.patch
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release
@@ -43,14 +37,14 @@
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
 BuildRequires:	doxygen tetex-latex
-## HACK; 'make check' fails there and I do not know how to debug it
+## HACK; 'make check' fails there due to a kernel bug
 ## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389
 ExcludeArch:	ppc
-Requires(post):		%__chattr
+Requires(post):		%name-core
 Requires(pre):		%pkglibdir
 Requires(postun):	%pkglibdir
 %{!?_without_dietlibc:BuildRequires:	dietlibc >= 0:0.25}
-%{!?_without_xalan:BuildRequires:	xalan-j}
+%{?_with_xalan:BuildRequires:	xalan-j}
 
 %package lib
 Summary:		Dynamic libraries for util-vserver
@@ -68,10 +62,7 @@
 Requires:		%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
-
-%ifarch %ix86
-Requires:		apt
-%endif
+Requires(post):		%name-core
 
 %package sysv
 Summary:		SysV-initscripts for vserver
@@ -176,8 +167,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .dietfix
-%patch1 -p2 -b .yum24
 
 
 %build
@@ -211,10 +200,15 @@
 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/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 || :
+
 
-%_sbindir/setattr --barrier /vservers || :
+%preun
+test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || :
 
 
 %post   lib -p /sbin/ldconfig
@@ -238,7 +232,7 @@
 test "$1" = 0  || %_initrddir/vprocunhide condrestart >/dev/null || :
 
 
-%triggerin build -- fedora-release
+%triggerin build -- fedora-release, centos-release
 function copy()
 {
     base=$1
@@ -251,13 +245,20 @@
 	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-*
 
@@ -306,9 +307,11 @@
 %dir %confdefaultdir/apps
 %dir %confdefaultdir/files
 %dir %pkglibdir/defaults
+%ghost %confdefaultdir/cachebase
 %ghost %confdefaultdir/vdirbase
 %ghost %confdefaultdir/run.rev
 
+%dir %_localstatedir/cache/vservers
 %dir %_localstatedir/run/vservers
 %dir %_localstatedir/run/vservers.rev
 %dir %_localstatedir/run/vshelper
@@ -347,6 +350,21 @@
 
 
 %changelog
+* Sun Jan 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.210-1
+- version 0.30.210
+- removed patches which were from upstream
+
+* Sun Jan 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 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 <enrico.scholz at informatik.tu-chemnitz.de> - 0.30.209-4
 - exclude PPC from build; see
   https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/util-vserver/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Oct 2005 10:44:10 -0000	1.7
+++ sources	22 Jan 2006 20:08:43 -0000	1.8
@@ -1,2 +1,2 @@
-674b122824292c20d3c53245b91f6088  util-vserver-0.30.209.tar.bz2
-f1386336cb8ec360ad7f440ab69ea21d  util-vserver-0.30.209.tar.bz2.asc
+1e8fff7cb6246d21ed029f082123019b  util-vserver-0.30.210.tar.bz2
+46625942d7064edeaa167ae5525694b7  util-vserver-0.30.210.tar.bz2.asc


--- util-vserver-0.30.209-yum24.patch DELETED ---


--- util-vserver-0.30.209-dietfix.patch DELETED ---

More information about the fedora-extras-commits mailing list