- fixed distributions/template/* permissions

[packages/util-vserver.git] / util-vserver.spec

diff --git a/util-vserver.spec b/util-vserver.spec
index 0aa7b31b543aa582e448316ee34943eabc6a16de..30c6ce61b1166d98ff7d386bbf9e54a4bd0b15eb 100644 (file)
--- a/util-vserver.spec
+++ b/util-vserver.spec
@@ -1,39 +1,51 @@
+# TODO
+# - somewhy empty /var/cache/vservers is needed when building pld vserver
+# - make build create /dev/std{in,out,err} links

 #
 # m68k and mips are the only not supported archs
 #
 # m68k and mips are the only not supported archs

+#

 # Conditional build:
 %bcond_without dietlibc        # don't use dietlibc (ask for troubles)
 %bcond_without doc             # don't build documentation which needed LaTeX
 %bcond_with    xalan           # use the xalan xslt processor
 # Conditional build:
 %bcond_without dietlibc        # don't use dietlibc (ask for troubles)
 %bcond_without doc             # don't build documentation which needed LaTeX
 %bcond_with    xalan           # use the xalan xslt processor

-
+#
+%define        _vproc_version 0.01
+# fails with ccache in %{__cc}
+%undefine      with_ccache
+#

 Summary:       Linux virtual server utilities
 Summary(pl):   Narzêdzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver
 Summary:       Linux virtual server utilities
 Summary(pl):   Narzêdzia dla linuksowych serwerów wirtualnych
 Name:          util-vserver

-Version:       0.30.208
-Release:       2.4
+Version:       0.30.210
+Release:       5.4

 License:       GPL
 Group:         Applications/System
 Source0:       http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%{name}-%{version}.tar.bz2
 License:       GPL
 Group:         Applications/System
 Source0:       http://www.13thfloor.at/~ensc/util-vserver/files/alpha/%{name}-%{version}.tar.bz2

-# Source0-md5: 4453ad0ae7f351fec651d6904e00521f
+# Source0-md5: 1e8fff7cb6246d21ed029f082123019b

 Source1:       vprocunhide.init
 Source1:       vprocunhide.init

-Source2:       vservers-default.init
+Source2:       vservers.init

 Source3:       vservers-legacy.init
 Source4:       rebootmgr.init
 Source3:       vservers-legacy.init
 Source4:       rebootmgr.init

-Source5:       vservers-default.sysconfig
+Source5:       vservers.sysconfig

 Source6:       vservers-legacy.sysconfig
 Source6:       vservers-legacy.sysconfig

-# A bit of documentation explaining package menagement
+Source7:       vrootdevices.init
+Source8:       vrootdevices.sysconfig
+# A bit of documentation explaining package management

 # http://www.paul.sladen.org/vserver/archives/200505/0078.html
 # http://www.paul.sladen.org/vserver/archives/200505/0078.html

-Source7:       %{name}-pkgmgmt.txt
+Source9:       %{name}-pkgmgmt.txt
+Source10:      %{name}-initpost.sh
+Source11:      http://www.13thfloor.at/vserver/s_release/v1.2.10/vproc-%{_vproc_version}.tar.bz2
+# Source11-md5:        1d030717bdbc958ea4b35fd2410dad85

 Patch0:                %{name}-vsysvwrapper.patch
 Patch1:                %{name}-pld.patch
 Patch0:                %{name}-vsysvwrapper.patch
 Patch1:                %{name}-pld.patch

-Patch2:                %{name}-build-poldek.patch
+Patch2:                %{name}-vrpm.patch

 Patch3:                %{name}-include.patch
 Patch4:                %{name}-m4-diet.patch
 Patch3:                %{name}-include.patch
 Patch4:                %{name}-m4-diet.patch

-Patch5:                http://vserver.13thfloor.at/Experimental/UTIL-VSERVER/delta-0.30.208-kheaders.diff
-Patch6:                http://vserver.13thfloor.at/Experimental/UTIL-VSERVER/delta-0.30.208-shiny6.diff
-Patch7:                %{name}-cpuset.patch
-Patch8:                %{name}-build-umask.patch
-Patch9:                %{name}-vwait-timeout-fix.patch
-Patch10:       %{name}-mounted.patch
+Patch5:                %{name}-cpuset.patch
+Patch6:                %{name}-build-umask.patch
+Patch7:                %{name}-utmpx.patch
+Patch8:                %{name}-vprocunhide.patch
+Patch9:                %{name}-dev.patch

 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.9
 URL:           http://savannah.nongnu.org/projects/util-vserver/
 BuildRequires: autoconf
 BuildRequires: automake >= 1.9


@@ -44,18 +56,26 @@ BuildRequires:      libtool >= 1.5.14
 %ifarch %{x8664}
 BuildRequires: sed >= 4.0
 %endif
 %ifarch %{x8664}
 BuildRequires: sed >= 4.0
 %endif

+BuildRequires: rpmbuild(macros) >= 1.268

 %if %{with doc}
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: libxslt-progs
 BuildRequires: tetex-format-pdflatex
 BuildRequires: tetex-makeindex
 %if %{with doc}
 BuildRequires: doxygen
 BuildRequires: graphviz
 BuildRequires: libxslt-progs
 BuildRequires: tetex-format-pdflatex
 BuildRequires: tetex-makeindex

+# To be removed when tetex-format-pdflatex, tetex-pdftex...
+# ...and graphviz packages get fixed
+BuildRequires: ghostscript
+BuildRequires: ghostscript-fonts-std
+BuildRequires: tetex-fonts-jknappen
+BuildRequires: tetex-metafont

 %{?with_xalan:BuildRequires:   xalan-j}
 %endif
 %{?with_xalan:BuildRequires:   xalan-j}
 %endif

-Requires:      rc-scripts
-Requires:      util-linux

 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-lib = %{version}-%{release}
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-lib = %{version}-%{release}

+Requires:      issue
+Requires:      rc-scripts
+Requires:      util-linux

 Obsoletes:     util-vserver-core
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 Obsoletes:     util-vserver-core
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -125,7 +145,7 @@ Group:              Libraries
 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
 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
+pith 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
 each other and can't interact with services in the main server.
 
 This package contains the shared libraries needed by all other


@@ -145,13 +165,9 @@ podpakiety util-vserver.
 Summary:       Tools which can be used to build vservers
 Summary(pl):   Narzêdzia do budowania vserverów
 Group:         Applications/System
 Summary:       Tools which can be used to build vservers
 Summary(pl):   Narzêdzia do budowania vserverów
 Group:         Applications/System

-Requires:      binutils
+Requires:      %{name} = %{version}-%{release}

 Requires:      e2fsprogs
 Requires:      e2fsprogs

-Requires:      rpm
-Requires:      tar
-Requires:      wget

 Conflicts:     poldek < 0.18.8-10
 Conflicts:     poldek < 0.18.8-10

-Requires:      %{name} = %{version}-%{release}

 
 %description build
 util-vserver provides the components and a framework to setup virtual
 
 %description build
 util-vserver provides the components and a framework to setup virtual


@@ -171,6 +187,70 @@ w interakcj
 
 Ten pakiet zawiera narzêdzia pomagaj±ce przy budowaniu Vserwerów.
 
 
 Ten pakiet zawiera narzêdzia pomagaj±ce przy budowaniu Vserwerów.
 

+%package -n vserver-distro-fedora
+Summary:       VServer build templates for Fedora Core
+Summary(pl):   Szablony do tworzenia VServerów dla dystrybucji Fedora Core
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+Requires:      binutils
+Requires:      e2fsprogs
+Requires:      rpm
+Requires:      tar
+Requires:      wget
+
+%description -n vserver-distro-fedora
+VServer build templates for Fedora Core 1,2,3,4.
+
+%description -n vserver-distro-fedora -l pl
+Szablony do tworzenia VServerów dla dystrybucji Fedora Core 1,2,3,4.
+
+%package -n vserver-distro-redhat
+Summary:       VServer build template for Red Hat Linux 9
+Summary(pl):   Szablon do tworzenia VServerów dla dystrybucji Red Hat Linux 9
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+Requires:      binutils
+Requires:      e2fsprogs
+Requires:      rpm
+Requires:      tar
+Requires:      wget
+
+%description -n vserver-distro-redhat
+VServer build template for RedHat Linux 9.
+
+%description -n vserver-distro-redhat -l pl
+Szablon do tworzenia VServerów dla dystrybucji Red Hat Linux 9.
+
+%package -n vserver-distro-suse
+Summary:       VServer build template for SuSE 9.1
+Summary(pl):   Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1
+Group:         Applications/System
+Requires:      %{name} = %{version}-%{release}
+Requires:      binutils
+Requires:      e2fsprogs
+Requires:      rpm
+Requires:      tar
+Requires:      wget
+
+%description -n vserver-distro-suse
+VServer build template for SuSE Linux 9.1.
+
+%description -n vserver-distro-suse -l pl
+Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
+
+%package -n vserver-distro-centos
+Summary:       VServer build template for CentOS 4.2
+Summary(pl):   Szablon budowania VServera dla CentOS 4.2
+Group:         Applications/System
+Requires:      util-vserver-build
+Requires:      yum
+
+%description -n vserver-distro-centos
+VServer build template for CentOS 4.2.
+
+%description -n vserver-distro-centos -l pl
+Szablon budowania VServera dla CentOS 4.2.
+

 %package init
 Summary:       initscripts for vserver
 Summary(pl):   Skrypty inicjalizuj±ce dla vserwera
 %package init
 Summary:       initscripts for vserver
 Summary(pl):   Skrypty inicjalizuj±ce dla vserwera


@@ -229,33 +309,8 @@ w interakcj
 Ten pakiet zawiera narzêdzia potrzebne do pracy z Vserwerami maj±cymi
 konfiguracjê w starym stylu.
 
 Ten pakiet zawiera narzêdzia potrzebne do pracy z Vserwerami maj±cymi
 konfiguracjê w starym stylu.
 

-%package -n vserver-dev
-Summary:       /dev entries for systems in Vservers
-Summary(pl):   Pliki specjalne /dev/* dla systemów w Vserwerach
-Group:         Base
-Requires:      setup >= 2.4.1-2
-Provides:      dev = 2.9.0-19
-Provides:      devfs
-AutoReqProv:   no
-
-%description -n vserver-dev
-Unix and unix like systems (including Linux) use file system entries
-to represent devices attached to the machine. All of these entries are
-in the /dev tree (though they don't have to be), and this package
-contains only entries needed for a system running inside Vserver.
-
-DO NOT install this package for a normal system!
-
-%description -n vserver-dev -l pl
-Wszystkie systemy klasy unices, w tym Linux, u¿ywaj± plików do
-przedstawiania urz±dzeñ pod³±czonych do komputera. Wszystkie te pliki
-znajduj± siê zwykle w katalogu /dev. Pakiet ten wy³±cznie te pliki
-specjalne które s± potrzebne do uruchomienia systemu w Vserwerze.
-
-NIE INSTALUJ tego pakietu na zwyk³ym systemie!
-

 %prep
 %prep

-%setup -q
+%setup -q -a11

 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1


@@ -266,9 +321,8 @@ NIE INSTALUJ tego pakietu na zwyk
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1

-%patch10 -p1

 
 

-install %{SOURCE7} package-menagament.txt
+install %{SOURCE9} package-management.txt

 
 cp -a compat.h vserver-compat.h
 
 
 cp -a compat.h vserver-compat.h
 


@@ -282,6 +336,7 @@ CFLAGS="%{rpmcflags} -D__GLIBC__"
 %configure \
        --with-initrddir=/etc/rc.d/init.d \
        --enable-release \
 %configure \
        --with-initrddir=/etc/rc.d/init.d \
        --enable-release \

+       --enable-apis=NOLEGACY \

        %{?with_dietlibc:--enable-dietlibc} \
        %{!?with_dietlibc:--disable-dietlibc} \
        MKTEMP=/bin/mktemp \
        %{?with_dietlibc:--enable-dietlibc} \
        %{!?with_dietlibc:--disable-dietlibc} \
        MKTEMP=/bin/mktemp \


@@ -299,6 +354,10 @@ CFLAGS="%{rpmcflags} -D__GLIBC__"
 %{__make} all
 %{?with_doc:%{__make} doc}
 
 %{__make} all
 %{?with_doc:%{__make} doc}
 

+%{__make} -C vproc-%{_vproc_version} \
+       CC="%{__cc}" \
+       CFLAGS="%{rpmcflags}"
+

 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/vservers,/etc/{sysconfig,rc.d/init.d},/dev/pts}
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{/vservers,/etc/{sysconfig,rc.d/init.d},/dev/pts}


@@ -327,22 +386,31 @@ done
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE1} > \
        $RPM_BUILD_ROOT/etc/rc.d/init.d/vprocunhide
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE2} > \
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE1} > \
        $RPM_BUILD_ROOT/etc/rc.d/init.d/vprocunhide
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE2} > \

-       $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default
+       $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers

 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE3} > \
        $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE4} > \
        $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE3} > \
        $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy
 sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE4} > \
        $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr

+sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE5} > \
+       $RPM_BUILD_ROOT/etc/sysconfig/vservers

 
 

-install %{SOURCE5} $RPM_BUILD_ROOT/etc/sysconfig/vservers-default

 install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy
 
 install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy
 

+install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices
+install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vrootdevices
+install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost
+install vproc-%{_vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir}
+

 ln -sf null $RPM_BUILD_ROOT/dev/initctl
 
 %ifarch %{x8664}
 ln -sf null $RPM_BUILD_ROOT/dev/initctl
 
 %ifarch %{x8664}

-sed -i 's/^glibc$/glibc64/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld2.0/pkgs/01
-sed -i 's/glibc\-\[0\-9\]\*\.rpm/glibc64\-\[0\-9\]\*\.rpm/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld2.0/rpmlist.d/00.lst
+sed -i 's/^glibc$/glibc64/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pkgs/01
+sed -i 's/glibc\-\[0\-9\]\*\.rpm/glibc64\-\[0\-9\]\*\.rpm/' $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/rpmlist.d/00.lst

 %endif
 
 %endif
 

+# baggins check this: needed but seems unused
+install -d $RPM_BUILD_ROOT/var/cache/vservers
+

 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 


@@ -353,57 +421,58 @@ rm -rf $RPM_BUILD_ROOT
 %postun        lib -p /sbin/ldconfig
 
 %post init
 %postun        lib -p /sbin/ldconfig
 
 %post init

-/sbin/chkconfig --add vservers-default
+/sbin/chkconfig --add vrootdevices

 /sbin/chkconfig --add vprocunhide
 /sbin/chkconfig --add vprocunhide

-#if [ -r /var/lock/subsys/vprocunhide ]; then
-#      /etc/rc.d/init.d/vprocunhide restart >&2
-#else
-       echo "Type \"/etc/rc.d/init.d/vprocunhide start\" to set /proc visibility for vservers" 1>&2
-#fi
-#if [ -r /var/lock/subsys/vservers-default ]; then
-#      /etc/rc.d/init.d/vservers-default restart >&2
-#else
-       echo "Type \"/etc/rc.d/init.d/vservers-default start\" to start default vservers" 1>&2
-#fi
+/sbin/chkconfig --add vservers
+if [ ! -f /var/lock/subsys/vrootdevices ]; then
+       echo "Type \"/sbin/service vrootdevices start\" to assign virtual root devices" 1>&2
+fi
+if [ ! -f /var/lock/subsys/vprocunhide ]; then
+       echo "Type \"/sbin/service vprocunhide start\" to set /proc visibility for vservers" 1>&2
+fi
+if [ ! -f /var/lock/subsys/vservers ]; then
+       echo "Type \"/sbin/service vservers start\" to start vservers" 1>&2
+fi

 
 %preun init
 if [ "$1" = "0" ]; then
 
 %preun init
 if [ "$1" = "0" ]; then

-        if [ -r /var/lock/subsys/vprocunhide ]; then
-               /etc/rc.d/init.d/vprocunhide stop >&2
-        fi
-        if [ -r /var/lock/subsys/vservers-default ]; then
-               /etc/rc.d/init.d/vservers-default stop >&2
-        fi
-        /sbin/chkconfig --del vprocunhide
-        /sbin/chkconfig --del vservers-default
+       %service vservers stop
+       %service vprocunhide stop
+       %service vrootdevices stop
+       /sbin/chkconfig --del vservers
+       /sbin/chkconfig --del vprocunhide
+       /sbin/chkconfig --del vrootdevices

 fi
 
 %post legacy
 /sbin/chkconfig --add rebootmgr
 /sbin/chkconfig --add vservers-legacy
 fi
 
 %post legacy
 /sbin/chkconfig --add rebootmgr
 /sbin/chkconfig --add vservers-legacy

-#if [ -r /var/lock/subsys/rebootmgr ] ; then
-#      /etc/rc.d/init.d/rebootmgr restart >&2
-#else
-       echo "Type \"/etc/rc.d/init.d/rebootmgr start\" to start reboot manager for legacy vservers" 1>&2
-#fi
-#if [ -r /var/lock/subsys/vservers-legacy ] ; then
-#      /etc/rc.d/init.d/vservers-legacy restart >&2
-#else
-       echo "Type \"/etc/rc.d/init.d/vservers-legacy start\" to start legacy vservers" 1>&2
-#fi
+if [ ! -f /var/lock/subsys/rebootmgr ] ; then
+       echo "Type \"/sbin/service rebootmgr start\" to start reboot manager for legacy vservers" 1>&2
+fi
+if [ ! -f /var/lock/subsys/vservers-legacy ] ; then
+       echo "Type \"/sbin/service vservers-legacy start\" to start legacy vservers" 1>&2
+fi

 
 %preun legacy
 if [ "$1" = "0" ]; then
 
 %preun legacy
 if [ "$1" = "0" ]; then

-       if [ -r /var/lock/subsys/rebootmgr ] ; then
-               /etc/rc.d/init.d/rebootmgr stop >&2
-       fi
-       if [ -r /var/lock/subsys/vservers-legacy ] ; then
-               /etc/rc.d/init.d/vservers-legacy stop >&2
-       fi
+       %service rebootmgr stop
+       %service vservers-legacy stop

        /sbin/chkconfig --del rebootmgr
        /sbin/chkconfig --del vservers-legacy
 fi
 
        /sbin/chkconfig --del rebootmgr
        /sbin/chkconfig --del vservers-legacy
 fi
 

+%triggerpostun build -- %{name}-build < 0.30.210-5.2
+if [ -f /etc/vservers/.distributions/pld2.0/poldek/poldek.conf.rpmsave ]; then
+       mv -f /etc/vservers/.distributions/{pld2.0,pld-ac}/poldek/poldek.conf.rpmsave
+fi
+
+# kill old vserver specific package ignores which are no longer needed
+l=`egrep '^ignore.*(basesystem|SysVinit|rc-scripts)' /etc/vservers/*/apps/pkgmgmt/base/poldek/etc/poldek.conf -l 2>/dev/null`
+if [ "$l" ]; then
+       %{__sed} -i -e '/^ignore/s, \(basesystem\|SysVinit\|rc-scripts\),,g' $l
+fi
+

 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS THANKS doc/intro.txt
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS THANKS doc/intro.txt


@@ -432,6 +501,7 @@ fi
 %attr(755,root,root) %{_sbindir}/vkill
 %attr(755,root,root) %{_sbindir}/vlimit
 %attr(755,root,root) %{_sbindir}/vdu
 %attr(755,root,root) %{_sbindir}/vkill
 %attr(755,root,root) %{_sbindir}/vlimit
 %attr(755,root,root) %{_sbindir}/vdu

+%attr(755,root,root) %{_sbindir}/vproc

 %attr(755,root,root) %{_sbindir}/vps
 %attr(755,root,root) %{_sbindir}/vpstree
 %attr(755,root,root) %{_sbindir}/vrsetup
 %attr(755,root,root) %{_sbindir}/vps
 %attr(755,root,root) %{_sbindir}/vpstree
 %attr(755,root,root) %{_sbindir}/vrsetup


@@ -483,6 +553,7 @@ fi
 %dir %{_localstatedir}/run/vservers
 %dir %{_localstatedir}/run/vservers.rev
 %dir %{_localstatedir}/run/vshelper
 %dir %{_localstatedir}/run/vservers
 %dir %{_localstatedir}/run/vservers.rev
 %dir %{_localstatedir}/run/vshelper

+%dir /var/cache/vservers

 
 %files devel
 %defattr(644,root,root,755)
 
 %files devel
 %defattr(644,root,root,755)


@@ -503,28 +574,30 @@ fi
 %files init
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/vsysvwrapper
 %files init
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/vsysvwrapper

-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers-default
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vrootdevices
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers

 %attr(754,root,root) /etc/rc.d/init.d/vprocunhide
 %attr(754,root,root) /etc/rc.d/init.d/vprocunhide

-%attr(754,root,root) /etc/rc.d/init.d/vservers-default
+%attr(754,root,root) /etc/rc.d/init.d/vrootdevices
+%attr(754,root,root) /etc/rc.d/init.d/vservers

 
 %files build
 %defattr(644,root,root,755)
 
 %files build
 %defattr(644,root,root,755)

-%doc contrib/yum*.patch package-menagament.txt
+%doc contrib/yum*.patch package-management.txt

 %dir %{_sysconfdir}/vservers/.defaults/apps/vunify
 %dir %{_sysconfdir}/vservers/.defaults/apps/vunify/hash
 %dir %{_sysconfdir}/vservers/.distributions
 %dir %{_sysconfdir}/vservers/.distributions/.common
 %dir %{_sysconfdir}/vservers/.distributions/.common/pubkeys
 %dir %{_sysconfdir}/vservers/.defaults/apps/vunify
 %dir %{_sysconfdir}/vservers/.defaults/apps/vunify/hash
 %dir %{_sysconfdir}/vservers/.distributions
 %dir %{_sysconfdir}/vservers/.distributions/.common
 %dir %{_sysconfdir}/vservers/.distributions/.common/pubkeys

-%dir %{_sysconfdir}/vservers/.distributions/[frs]*
-%dir %{_sysconfdir}/vservers/.distributions/[frs]*/apt
-%dir %{_sysconfdir}/vservers/.distributions/pld2.0
-%dir %{_sysconfdir}/vservers/.distributions/pld2.0/poldek
-%{_sysconfdir}/vservers/.distributions/pld1.99
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/[frs]*/apt/sources.list
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld2.0/poldek/poldek.conf
+%dir %{_sysconfdir}/vservers/.distributions/pld-ac
+%dir %{_sysconfdir}/vservers/.distributions/pld-ac/poldek
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ac/poldek/*.conf

 %attr(755,root,root) %{_libdir}/%{name}/rpm-fake*
 %dir %{_libdir}/%{name}/distributions
 %attr(755,root,root) %{_libdir}/%{name}/rpm-fake*
 %dir %{_libdir}/%{name}/distributions

-%attr(-, root, root) %{_libdir}/%{name}/distributions/*
+%attr(-,root,root) %{_libdir}/%{name}/distributions/defaults
+%attr(-,root,root) %{_libdir}/%{name}/distributions/pld*
+%dir %{_libdir}/%{name}/distributions/template
+%attr(755,root,root) %{_libdir}/%{name}/distributions/template/init*
+%attr(-,root,root) %{_libdir}/%{name}/distributions/redhat

 %{_libdir}/%{name}/vserver-build.*
 %{_libdir}/%{name}/vserver-setup.functions
 %{_libdir}/%{name}/defaults/fstab
 %{_libdir}/%{name}/vserver-build.*
 %{_libdir}/%{name}/vserver-setup.functions
 %{_libdir}/%{name}/defaults/fstab


@@ -545,6 +618,31 @@ fi
 %attr(755,root,root) %{_sbindir}/vrpm
 %attr(755,root,root) %{_sbindir}/vyum
 
 %attr(755,root,root) %{_sbindir}/vrpm
 %attr(755,root,root) %{_sbindir}/vyum
 

+%files -n vserver-distro-fedora
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/vservers/.distributions/fc*
+%dir %{_sysconfdir}/vservers/.distributions/fc*/apt
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/fc*/apt/sources.list
+%{_libdir}/%{name}/distributions/fc*
+
+%files -n vserver-distro-redhat
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/vservers/.distributions/rh*
+%dir %{_sysconfdir}/vservers/.distributions/rh*/apt
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/rh*/apt/sources.list
+%{_libdir}/%{name}/distributions/rh*
+
+%files -n vserver-distro-suse
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/vservers/.distributions/suse*
+%dir %{_sysconfdir}/vservers/.distributions/suse*/apt
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/suse*/apt/sources.list
+%{_libdir}/%{name}/distributions/suse*
+
+%files -n vserver-distro-centos
+%defattr(644,root,root,755)
+%{_libdir}/util-vserver/distributions/centos42
+

 %files legacy
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/vservices
 %files legacy
 %defattr(644,root,root,755)
 %dir %{_sysconfdir}/vservices


@@ -559,15 +657,3 @@ fi
 %{_mandir}/man8/distrib-info.8*
 %{_mandir}/man8/rebootmgr.8*
 %{_mandir}/man8/vserver-copy.8*
 %{_mandir}/man8/distrib-info.8*
 %{_mandir}/man8/rebootmgr.8*
 %{_mandir}/man8/vserver-copy.8*

-
-%files -n vserver-dev
-%defattr(644,root,root,755)
-%dir /dev/pts
-%dev(c,1,7) %attr(666,root,root) /dev/full
-%dev(c,1,3) %attr(666,root,root) /dev/null
-%dev(c,5,2) %attr(666,root,root) /dev/ptmx
-%dev(c,1,8) %attr(644,root,root) /dev/random
-%dev(c,5,0) %attr(666,root,root) /dev/tty
-%dev(c,1,9) %attr(644,root,root) /dev/urandom
-%dev(c,1,5) %attr(666,root,root) /dev/zero
-/dev/initctl