dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: util-vserver
-# $Id$
-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 $$/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)

sources

@@ -1,2 +1,2 @@
-b0e8d503ba1cf5a7014eb41a72ec8fe2  util-vserver-0.30.211.tar.bz2
+8bad879e36a6a1b9b4858d0d6d3c8c76  util-vserver-0.30.214.tar.bz2
-400c5fad81a029dc88fb03485a9a503e  util-vserver-0.30.211.tar.bz2.asc
+ce8fd758ce4d201791020f6f87f0bddf  util-vserver-0.30.214.tar.bz2.asc

util-vserver-0.30.214-stat.patch

@@ -0,0 +1,14 @@
+Index: lib_internal/util-safechdir.h
+===================================================================
+--- lib_internal/util-safechdir.h	(revision 2605)
++++ lib_internal/util-safechdir.h	(working copy)
+@@ -19,7 +19,8 @@
+ #ifndef H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
+ #define H_UTIL_VSERVER_LIB_INTERNAL_UTIL_SAFECHDIR_H
+ 
+-struct stat;
++#include <sys/stat.h>
++
+ int	safeChdir(char const *, struct stat const *exp_stat) NONNULL((1,2));
+ 
+ #define EsafeChdir(PATH,EXP_STAT) \

util-vserver.spec

@@ -5,7 +5,15 @@
 ## --with    xalan           ...   require/use the xalan xslt processor
 
 ## Fedora Extras specific customization below...
+
+%ifarch ppc64
+%bcond_with		dietlibc
+%else
 %bcond_without		dietlibc
+%endif
+
+%bcond_with		xalan
+
 ##
 
 %global confdir		%_sysconfdir/vservers
@@ -20,13 +28,15 @@
 
 Summary:	Linux virtual server utilities
 Name:		util-vserver
-Version:	0.30.211
+Version:	0.30.214
-Release:	%release_func 1
+Release:	%release_func 2
 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
+Source0:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2
-Source1:	http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%name-%version.tar.bz2.asc
+Source1:	http://ftp.linux-vserver.org/pub/utils/util-vserver/%name-%version.tar.bz2.asc
+Patch0:		util-vserver-0.30.214-stat.patch
+
 BuildRoot:	%_tmppath/%name-%version-%release-root
 Requires:	init(%name)
 Requires:	%name-core = %version-%release
@@ -37,15 +47,13 @@ Obsoletes:	vserver < %version
 BuildRequires:	mount vconfig gawk iproute iptables
 BuildRequires:	gcc-c++ wget which diffutils
 BuildRequires:	e2fsprogs-devel beecrypt-devel
-BuildRequires:	doxygen tetex-latex
+BuildRequires:	doxygen tetex-latex graphviz ghostscript
-## HACK; 'make check' fails there due to a kernel bug
+BuildRequires:	libxslt rsync dump
-## https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=172389
-ExcludeArch:	ppc
 Requires(post):		%name-core
 Requires(pre):		%pkglibdir
 Requires(postun):	%pkglibdir
 %{?with_dietlibc:BuildRequires:	dietlibc}
-%{?_with_xalan:BuildRequires:	xalan-j}
+%{?with_xalan:BuildRequires:	xalan-j}
 
 %package lib
 Summary:		Dynamic libraries for util-vserver
@@ -59,7 +67,7 @@ Requires:		util-linux
 %package build
 Summary:		Tools which can be used to build vservers
 Group:			Applications/System
-Requires:		rpm wget binutils tar e2fsprogs
+Requires:		rpm wget binutils tar e2fsprogs rsync
 Requires:		%name = %version-%release
 Requires(pre):		%confdir
 Requires(postun):	%confdir
@@ -168,6 +176,7 @@ develop VServer related applications.
 
 %prep
 %setup -q
+%patch0 -p0 -b .stat
 
 
 %build
@@ -219,7 +228,7 @@ test "$1" != 0 || rm -rf %_localstatedir/cache/vservers/* 2>/dev/null || :
 %post sysv
 %chkconfig --add vservers-default
 %chkconfig --add vprocunhide
-
+%chkconfig --add util-vserver
 
 
 %preun sysv
@@ -227,6 +236,7 @@ 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
@@ -251,6 +261,9 @@ copy fedora /etc/pki/rpm-gpg/RPM-GPG-*
 copy centos /usr/share/doc/centos-*/RPM-GPG-KEY-*
 
 
+%pre build
+d=%_libdir/util-vserver/distributions/etch; test x"$1" = x1 -o ! -d "$d" -o -L "$d" || rm -rf "$d" || :
+
 %post build
 test -d /vservers/.hash || mkdir -m0700 /vservers/.hash
 
@@ -351,6 +364,37 @@ test "$1" = 0  || %_initrddir/rebootmgr   condrestart >/dev/null || :
 
 
 %changelog
+* Wed Sep 19 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 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 <enrico.scholz@informatik.tu-chemnitz.de> - 0.30.214-1
+- updated to 0.30.214
+
+* Sat Aug  4 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.30.213-2
+- added patch to make 'vyum' work with a patched yum-3.2
+
+* Thu May 31 2007 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 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 <enrico.scholz@informatik.tu-chemnitz.de> - 0.30.212-4
+- BR some tools tested by ./configure
+
+* Fri Jan 19 2007 David Woodhouse <dwmw2@infradead.org> - 0.30.212-3
+- Build with 64KiB page size
+
+* Fri Jan 19 2007 David Woodhouse <dwmw2@infradead.org> - 0.30.212-2
+- rebuilt with PPC support
+
+* Sun Dec 10 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.30.212-1
+- updated to 0.30.212
+- updated URLs
+- requires 'rsync' for -build to support new 'rsync' build method
+- added graphviz + ghostscript BR
+
 * Thu Oct 12 2006 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> - 0.30.211-1
 - updated to 0.30.211