X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=util-vserver.spec;h=5f6fc8c55d84d0c4ae9d171f2174a29fdf5bf18f;hb=35d779f232a26b2f03b4a9961bf21f1dd7b9baa6;hp=1554b8ec88f6a002402374f184231596536d0c8b;hpb=befcea8eab367c8408651bee8eb06cc1149fbbee;p=packages%2Futil-vserver.git diff --git a/util-vserver.spec b/util-vserver.spec index 1554b8e..5f6fc8c 100644 --- a/util-vserver.spec +++ b/util-vserver.spec @@ -1,32 +1,34 @@ -# -# m68k and mips are the only not supported archs +# NOTE: +# - 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_without no_dynamic_context # disable enforcement of disabled dynamic context %bcond_with xalan # use the xalan xslt processor -# +%bcond_with legacy # build legacy 1.x utils + %define vproc_version 0.01 -# diet compile fails with ccache in %{__cc} -%undefine with_ccache -# + %ifarch ppc # pdflatex: refman: Invalid argument %undefine with_doc %endif -# -%define snap r2844 -# + +# reqdb_pkg and reqdb_ver must match value from current rpm package in distro +%define reqdb_pkg db5.2 +%define reqdb_ver 5.2 +%define snap pre3034 +%define rel 8 Summary: Linux virtual server utilities Summary(pl.UTF-8): Narzędzia dla linuksowych serwerów wirtualnych Name: util-vserver Version: 0.30.216 -Release: 0.%{snap}.1 +Release: 1.%{snap}.%{rel} License: GPL Group: Applications/System -Source0: %{name}-%{version}-%{snap}.tar.bz2 -# Source0-md5: e7a0b28e935bfce9f6db1dc5d93dc7b5 +Source0: http://people.linux-vserver.org/~dhozac/t/uv-testing/%{name}-%{version}-%{snap}.tar.bz2 +# Source0-md5: c0f708814ff48532802a5fb04514a86c Source1: vprocunhide.init Source2: vservers.init Source3: vservers-legacy.init @@ -47,9 +49,11 @@ Source13: ftp://ftp.pld-linux.org/dists/ac/PLD-2.0-Ac-GPG-key.asc Source14: ftp://ftp.pld-linux.org/dists/th/PLD-3.0-Th-GPG-key.asc # Source14-md5: 08b29584dd349aac9caa7610131a0a88 Source15: %{name}.init +Source16: %{name}.tmpfiles Patch0: %{name}-vsysvwrapper.patch Patch1: %{name}-pld.patch Patch2: %{name}-centos.patch +Patch3: %{name}-tld.patch Patch4: %{name}-m4-diet.patch Patch5: %{name}-yum-verb-nogpg.patch Patch6: %{name}-build-umask.patch @@ -67,37 +71,45 @@ Patch17: %{name}-backupfiles.patch Patch18: %{name}-vprocunhide-net.patch # http://glen.alkohol.ee/pld/util-vserver-dbrebuild-internalize4.patch Patch19: %{name}-dbrebuild-internalize4.patch -Patch20: %{name}-dev-stdfd.patch Patch21: %{name}-bash-wrapper.patch Patch22: %{name}-pivot-root-ugly-hack.patch -Patch23: %{name}-ac.patch +Patch24: vunify-more-exclude.patch +Patch25: stat.patch +Patch26: %{name}-am.patch +Patch27: %{name}-rpm5.patch +Patch28: diet-ccache.patch URL: http://savannah.nongnu.org/projects/util-vserver/ BuildRequires: autoconf BuildRequires: automake >= 1.9 BuildRequires: beecrypt-devel BuildRequires: ctags -%{?with_dietlibc:BuildRequires: dietlibc-static >= 2:0.29} +%{?with_dietlibc:BuildRequires: dietlibc-static >= 2:0.32-16} BuildRequires: e2fsprogs-devel BuildRequires: libstdc++-devel BuildRequires: libtool >= 1.5.14 -%ifarch %{x8664} +BuildRequires: pkgconfig +BuildRequires: python-devel +BuildRequires: python-modules +BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.647 BuildRequires: sed >= 4.0 -%endif -BuildRequires: rpmbuild(macros) >= 1.268 %if %{with doc} -BuildRequires: doxygen +BuildRequires: doxygen >= 1:1.7.3 BuildRequires: graphviz BuildRequires: libxslt-progs BuildRequires: python-devel -BuildRequires: rpm-pythonprov -%if "%{pld_release}" == "ti" +%if "%{pld_release}" != "th" BuildRequires: tetex-fonts-jknappen BuildRequires: tetex-format-pdflatex BuildRequires: tetex-makeindex BuildRequires: tetex-metafont %else +BuildRequires: texlive-fonts-rsfs BuildRequires: texlive-fonts-type1-urw BuildRequires: texlive-format-pdflatex +BuildRequires: texlive-latex-ams +BuildRequires: texlive-latex-extend +BuildRequires: texlive-latex-ucs BuildRequires: texlive-makeindex BuildRequires: texlive-pdftex BuildRequires: texlive-xetex @@ -111,10 +123,13 @@ Requires: diffutils Requires: issue Requires: make Requires: mktemp >= 1.5-18 -Requires: rc-scripts +Requires: rc-scripts >= 0.4.3.4 +#Requires: rpm >= 3.4.10-36 Requires: tar -Requires: util-linux +Requires: uname(release) >= 2.6.27 +Requires: util-linux >= 2.13 Requires: vserver-distro-pld = %{version}-%{release} +Suggests: %{reqdb_pkg}-utils Obsoletes: util-vserver-build Obsoletes: util-vserver-core Obsoletes: util-vserver-init @@ -285,13 +300,14 @@ Group: Applications/System Requires: %{name} = %{version}-%{release} Requires: debootstrap Requires: dpkg +Provides: vserver-distro-ubuntu Obsoletes: vserver-distro-ubuntu %description -n vserver-distro-debian -VServer build templates for Debian. +VServer build templates for Debian and Ubuntu. %description -n vserver-distro-debian -l pl.UTF-8 -Szablony do tworzenia VServerów dla dystrybucji Debian. +Szablony do tworzenia VServerów dla dystrybucji Debian i Ubuntu. %package -n vserver-distro-fedora Summary: VServer build templates for Fedora @@ -301,8 +317,8 @@ Requires: %{name} = %{version}-%{release} Requires: binutils Requires: e2fsprogs Requires: rpm -Requires: wget Requires: vserver-distro-redhat = %{version}-%{release} +Requires: wget Requires: yum %description -n vserver-distro-fedora @@ -370,11 +386,42 @@ VServer build template for SuSE Linux 9.1. %description -n vserver-distro-suse -l pl.UTF-8 Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1. +%package -n vserver-distro-scientificlinux +Summary: VServer build template for Scientific Linux +Summary(pl.UTF-8): Szablon do tworzenia VServerów dla dystrybucji Scientific Linux +Group: Applications/System +Requires: %{name} = %{version}-%{release} +Requires: binutils +Requires: e2fsprogs +Requires: rpm +Requires: wget +Requires: yum + +%description -n vserver-distro-scientificlinux +VServer build template for Scientific Linux. + +%description -n vserver-distro-scientificlinux -l pl.UTF-8 +Szablon do tworzenia VServerów dla dystrybucji Scientific Linux. + +%package -n vserver-distro-tld +Summary: VServer build templates for Titanium Linux Distribution +Summary(pl.UTF-8): Szablony do tworzenia VServerów dla dystrybucji Titanium Linux +Group: Applications/System +Requires: %{name} = %{version}-%{release} +Requires: poldek >= 0.30 + +%description -n vserver-distro-tld +VServer build templates for Titanium Linux Distribution. + +%description -n vserver-distro-tld -l pl.UTF-8 +Szablony do tworzenia VServerów dla dystrybucji Titanium Linux. + %prep %setup -q -n %{name}-%{version}-%{snap} -a11 %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 @@ -391,12 +438,17 @@ Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1. %patch17 -p1 %patch18 -p1 %patch19 -p1 -%patch20 -p1 %patch21 -p1 %patch22 -p1 -%patch23 -p0 +%patch24 -p1 +%patch25 -p1 +%patch26 -p1 +%patch27 -p1 +%patch28 -p1 + +cp -p %{SOURCE9} package-management.txt -install %{SOURCE9} package-management.txt +%{__sed} -i -e "s/@RPMDB@/%{reqdb_ver}/g" scripts/pkgmgmt %build unset LD_SYMBOLIC_FUNCTIONS || : @@ -414,19 +466,26 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__" --enable-apis=NOLEGACY \ --with-initscripts=sysv \ --%{?with_dietlibc:en}%{!?with_dietlibc:dis}able-dietlibc \ - MKTEMP=/bin/mktemp \ - MOUNT=/bin/mount \ - PS=/bin/ps \ - UMOUNT=/bin/umount \ + FSCK=/sbin/fsck \ + IONICE=%{_usrbin}/ionice \ IP=/sbin/ip \ IPTABLES=%{_usrsbin}/iptables \ + MKTEMP=/bin/mktemp \ MODPROBE=/sbin/modprobe \ + MOUNT=/bin/mount \ NAMEIF=/sbin/nameif \ + PS=/bin/ps \ + RESTORE=/sbin/restore \ RMMOD=/sbin/rmmod \ + RSYNC=%{_usrbin}/rsync \ + STRACE=%{_usrbin}/strace \ + UMOUNT=/bin/umount \ VCONFIG=/sbin/vconfig \ WGET=%{_usrbin}/wget \ +# end %{__make} all + %{?with_doc:%{__make} doc} %{__make} -C vproc-%{vproc_version} \ @@ -436,16 +495,40 @@ CFLAGS="%{rpmcflags} -D__GLIBC__ -D__KERNEL_STRICT_NAMES=1 -U__STRICT_ANSI__" %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/vservers/.pkg,/etc/{sysconfig,rc.d/init.d,cron.d}} \ - $RPM_BUILD_ROOT%{_sysconfdir}/vservices \ - $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/apps/vdevmap + $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/{apps/vdevmap,cgroup} \ + $RPM_BUILD_ROOT%{systemdtmpfilesdir} %{__make} -j1 install install-distribution \ +%if %{without legacy} + scripts_legacy_src_SCRPTS= \ + scripts_legacy_gen_SCRPTS= \ + scripts_legacy_src_PRGS= \ + sysv_gen_SCRPTS= \ + legacy_PROGRAMS= \ +%endif DESTDIR=$RPM_BUILD_ROOT +# our libcgroup uses per subsystem mount +touch $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.defaults/cgroup/per-ss + chmod -R +rX $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/* +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 +sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE15} > \ + $RPM_BUILD_ROOT/etc/rc.d/init.d/util-vserver +sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE5} > \ + $RPM_BUILD_ROOT/etc/sysconfig/vservers +sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' gentoo/bash-wrapper > \ + $RPM_BUILD_ROOT%{_libdir}/%{name}/bash-wrapper + +%if %{with legacy} +install -d $RPM_BUILD_ROOT%{_sysconfdir}/vservices + for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do - s=`basename $i | sed s/v_//` + s=$(basename $i | sed s/v_//) cat >$RPM_BUILD_ROOT%{_sysconfdir}/vservices/$s << EOF # IP addresses/interfaces to bound $s service to #IP=10.0.0.1 @@ -453,44 +536,41 @@ for i in $RPM_BUILD_ROOT/etc/rc.d/init.d/v_* ; do EOF 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} > \ - $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' %{SOURCE15} > \ - $RPM_BUILD_ROOT/etc/rc.d/init.d/util-vserver -sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' %{SOURCE5} > \ - $RPM_BUILD_ROOT/etc/sysconfig/vservers -sed 's|%{_usrlib}/util-vserver|%{_libdir}/%{name}|g' gentoo/bash-wrapper > \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/bash-wrapper - -install %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy +install -p %{SOURCE6} $RPM_BUILD_ROOT/etc/sysconfig/vservers-legacy +%else +rm $RPM_BUILD_ROOT/etc/rc.d/init.d/rebootmgr +rm $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-legacy +rm $RPM_BUILD_ROOT%{_mandir}/man8/distrib-info.8 +rm $RPM_BUILD_ROOT%{_mandir}/man8/rebootmgr.8 +rm $RPM_BUILD_ROOT%{_mandir}/man8/vserver-copy.8 +%endif -install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices -install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vrootdevices +install -p %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/vrootdevices +cp -p %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/vrootdevices install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld -install %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld/initpost +install -p %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld/initpost +install -p %{SOURCE10} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/tld/initpost ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/initpost ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/initpost -%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4 -ln -s ../pld/initpost $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ti/initpost -%endif -install vproc-%{vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir} -install %{SOURCE12} $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron +install -p vproc-%{vproc_version}/vproc $RPM_BUILD_ROOT%{_sbindir} +sed -e 's,/usr/lib,%{_libdir},' %{SOURCE12} > $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron +chmod +x $RPM_BUILD_ROOT%{_libdir}/%{name}/vhashify.cron cat > $RPM_BUILD_ROOT/etc/cron.d/vservers << EOF 02 2 * * 0 root %{_libdir}/%{name}/vhashify.cron EOF install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys -cp -a %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys/pld-ac.asc +cp -p %{SOURCE13} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-ac/pubkeys/pld-ac.asc install -d $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys -cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc +cp -p %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys/pld-th.asc + +cp -p %{SOURCE16} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/%{name}.conf # set arch for pld-ac in pld.conf %ifarch i586 i686 ppc sparc alpha athlon @@ -528,9 +608,8 @@ cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys %endif %{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/pld.conf -%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4 -# set arch for pld-ti in pld.conf -%ifarch i586 i686 +# set arch for tld in tld.conf +%ifarch i586 i686 ppc sparc alpha %define ftp_arch %{_target_cpu} %endif %ifarch %{x8664} @@ -539,8 +618,7 @@ cp -a %{SOURCE14} $RPM_BUILD_ROOT%{_libdir}/%{name}/distributions/pld-th/pubkeys %ifarch athlon pentium2 pentium3 pentium4 %define ftp_arch i686 %endif -%{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/pld.conf -%endif +%{__sed} -i -e 's|%%ARCH%%|%{ftp_arch}|' $RPM_BUILD_ROOT%{_sysconfdir}/vservers/.distributions/tld/poldek/repos.d/tld.conf # current debootstrap link echo "http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.10_all.deb" \ @@ -548,12 +626,13 @@ echo "http://ftp.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.10_al install -d $RPM_BUILD_ROOT/var/cache/vservers/poldek +# cleanups +%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/_libvserver.la # we have our own initscript which does the same -rm -rf $RPM_BUILD_ROOT/dev -rm -f $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-wrapper -rm -f $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-init.functions -rm -f $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/vservers.conf +%{__rm} $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-wrapper +%{__rm} $RPM_BUILD_ROOT%{_libdir}/util-vserver/vserver-init.functions +%{__rm} $RPM_BUILD_ROOT/etc/rc.d/init.d/vservers-default +%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/vservers.conf %clean rm -rf $RPM_BUILD_ROOT @@ -647,7 +726,7 @@ exit 0 %files %defattr(644,root,root,755) %doc AUTHORS NEWS THANKS doc/intro.txt -%doc contrib/yum*.patch package-management.txt +%doc package-management.txt %{?with_doc:%doc doc/*.html} %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vrootdevices %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/vservers @@ -662,6 +741,8 @@ exit 0 %dir %{_sysconfdir}/vservers/.defaults/apps/vdevmap %dir %{_sysconfdir}/vservers/.defaults/apps/vunify %dir %{_sysconfdir}/vservers/.defaults/apps/vunify/hash +%dir %{_sysconfdir}/vservers/.defaults/cgroup +%{_sysconfdir}/vservers/.defaults/cgroup/per-ss %dir %{_sysconfdir}/vservers/.defaults/files %{_sysconfdir}/vservers/.defaults/vdirbase %{_sysconfdir}/vservers/.defaults/cachebase @@ -707,6 +788,7 @@ exit 0 %attr(755,root,root) %{_sbindir}/vtag %attr(755,root,root) %{_sbindir}/vtop %attr(755,root,root) %{_sbindir}/vuname +%attr(755,root,root) %{_sbindir}/vurpm %attr(755,root,root) %{_sbindir}/vwait %attr(755,root,root) %{_sbindir}/vyum %dir %{_libdir}/%{name} @@ -724,10 +806,6 @@ exit 0 %dir %{_libdir}/%{name}/distributions/template %attr(755,root,root) %{_libdir}/%{name}/distributions/template/initpost %attr(755,root,root) %{_libdir}/%{name}/distributions/template/initpre -%dir %{_libdir}/%{name}/distributions/redhat -%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/initpost -%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/initpre -%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/rc.sysinit %{_libdir}/%{name}/FEATURES.txt %{_libdir}/%{name}/util-vserver-vars %attr(755,root,root) %{_libdir}/%{name}/bash-wrapper @@ -765,6 +843,7 @@ exit 0 %attr(755,root,root) %{_libdir}/%{name}/vprocunhide %attr(755,root,root) %{_libdir}/%{name}/vrpm-* %attr(755,root,root) %{_libdir}/%{name}/vserver-build +%attr(755,root,root) %{_libdir}/%{name}/vurpm-worker %{_libdir}/%{name}/vserver-build.* %{_libdir}/%{name}/vserver-setup.functions %{_libdir}/%{name}/vserver.* @@ -786,6 +865,7 @@ exit 0 %{_mandir}/man8/vtop.8* %attr(000,root,root) %dir /vservers %dir /vservers/.pkg +%{systemdtmpfilesdir}/%{name}.conf %dir %{_localstatedir}/run/vservers %dir %{_localstatedir}/run/vservers.rev %dir %{_localstatedir}/run/vshelper @@ -809,6 +889,7 @@ exit 0 %defattr(644,root,root,755) %{_libdir}/libvserver.a +%if %{with legacy} %files legacy %defattr(644,root,root,755) %dir %{_sysconfdir}/vservices @@ -823,10 +904,12 @@ exit 0 %{_mandir}/man8/distrib-info.8* %{_mandir}/man8/rebootmgr.8* %{_mandir}/man8/vserver-copy.8* +%endif %files -n python-util-vserver %defattr(644,root,root,755) %attr(755,root,root) %{py_sitedir}/_libvserver.so +%{py_sitedir}/libvserver.py %files -n vserver-distro-alpine %defattr(644,root,root,755) @@ -845,6 +928,8 @@ exit 0 %{_libdir}/%{name}/distributions/etch %{_libdir}/%{name}/distributions/lenny %{_libdir}/%{name}/distributions/sid +%{_libdir}/%{name}/distributions/squeeze +%{_libdir}/%{name}/distributions/wheezy %files -n vserver-distro-fedora %defattr(644,root,root,755) @@ -859,6 +944,9 @@ exit 0 %{_libdir}/%{name}/distributions/f9 %{_libdir}/%{name}/distributions/f10 %{_libdir}/%{name}/distributions/f11 +%{_libdir}/%{name}/distributions/f12 +%{_libdir}/%{name}/distributions/f13 +%{_libdir}/%{name}/distributions/f14 %{_libdir}/%{name}/distributions/fc1 %{_libdir}/%{name}/distributions/fc2 %{_libdir}/%{name}/distributions/fc3 @@ -892,12 +980,6 @@ exit 0 %dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek %dir %{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-th/poldek/repos.d/*.conf -%ifarch i586 i686 %{x8664} athlon pentium2 pentium3 pentium4 -%dir %{_sysconfdir}/vservers/.distributions/pld-ti -%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek -%dir %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/pld-ti/poldek/repos.d/*.conf -%endif %files -n vserver-distro-redhat %defattr(644,root,root,755) @@ -917,3 +999,23 @@ exit 0 %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-scientificlinux +%defattr(644,root,root,755) +%dir %{_libdir}/%{name}/distributions/sl6 +%attr(755,root,root) %{_libdir}/%{name}/distributions/sl6/initpost +%attr(755,root,root) %{_libdir}/%{name}/distributions/sl6/initpre +%{_libdir}/%{name}/distributions/sl6/pkgs +%{_libdir}/%{name}/distributions/sl6/yum +%{_libdir}/%{name}/distributions/sl6/yum.repos.d + +%files -n vserver-distro-tld +%defattr(644,root,root,755) +%dir %{_libdir}/%{name}/distributions/tld +%attr(755,root,root) %{_libdir}/%{name}/distributions/tld/initpost +%{_libdir}/%{name}/distributions/tld/pkgs +%{_libdir}/%{name}/distributions/tld/rpm +%dir %{_sysconfdir}/vservers/.distributions/tld +%dir %{_sysconfdir}/vservers/.distributions/tld/poldek +%dir %{_sysconfdir}/vservers/.distributions/tld/poldek/repos.d +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/tld/poldek/repos.d/*.conf