Author: hawk Date: Wed Aug 12 23:12:37 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- DEVEL merge:
- ubuntu was not dropped by upstream, it is now supported by
vserver-ditro-debian, updated descriptions and moved O: to proper place
- fixed vserver-distro-redhat and vserver-distro-fedora, more verbose
files
---- Files affected:
packages/util-vserver:
util-vserver.spec (1.238 -> 1.239)
---- Diffs:
================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.238
packages/util-vserver/util-vserver.spec:1.239
--- packages/util-vserver/util-vserver.spec:1.238 Thu Aug 13 01:06:17 2009
+++ packages/util-vserver/util-vserver.spec Thu Aug 13 01:12:31 2009
@@ -120,7 +120,6 @@
Obsoletes: util-vserver-build
Obsoletes: util-vserver-core
Obsoletes: util-vserver-init
-Obsoletes: vserver-distro-ubuntu
Conflicts: poldek < 0.18.8-10
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -272,6 +271,7 @@
Summary(pl.UTF-8): Szablon budowania VServerów dla dystrybucji CentOS
Group: Applications/System
Requires: %{name} = %{version}-%{release}
+Requires: vserver-distro-redhat = %{version}-%{release}
Requires: yum
%description -n vserver-distro-centos
@@ -281,11 +281,13 @@
Szablon budowania VServerów dla dystrybucji CentOS 4.2 i 5.
%package -n vserver-distro-debian
-Summary: VServer build templates for Debian
-Summary(pl.UTF-8): Szablony do tworzenia VServerów dla dystrybucji Debian
+Summary: VServer build templates for Debian and Ubuntu
+Summary(pl.UTF-8): Szablony do tworzenia VServerów dla dystrybucji Debian
i Ubuntu
Group: Applications/System
Requires: %{name} = %{version}-%{release}
+Requires: debootstrap
Requires: dpkg
+Obsoletes: vserver-distro-ubuntu
%description -n vserver-distro-debian
VServer build templates for Debian.
@@ -302,6 +304,7 @@
Requires: e2fsprogs
Requires: rpm
Requires: wget
+Requires: vserver-distro-redhat = %{version}-%{release}
Requires: yum
%description -n vserver-distro-fedora
@@ -725,7 +728,6 @@
%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/initctl
%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
@@ -855,7 +857,12 @@
%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/f*
+%{_libdir}/%{name}/distributions/f7
+%{_libdir}/%{name}/distributions/f8
+%{_libdir}/%{name}/distributions/f9
+%{_libdir}/%{name}/distributions/f10
+%{_libdir}/%{name}/distributions/f11
+%{_libdir}/%{name}/distributions/fc*
%files -n vserver-distro-gentoo
%defattr(644,root,root,755)
@@ -892,10 +899,15 @@
%files -n vserver-distro-redhat
%defattr(644,root,root,755)
-%dir %{_sysconfdir}/vservers/.distributions/rh*
-%dir %{_sysconfdir}/vservers/.distributions/rh*/apt
+%dir %{_sysconfdir}/vservers/.distributions/rh9
+%dir %{_sysconfdir}/vservers/.distributions/rh9/apt
%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/vservers/.distributions/rh*/apt/sources.list
-%{_libdir}/%{name}/distributions/rh*
+%{_libdir}/%{name}/distributions/rh9
+%dir %{_libdir}/%{name}/distributions/redhat
+%attr(755,root,root) %{_libdir}/%{name}/distributions/redhat/initctl
+%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
%files -n vserver-distro-suse
%defattr(644,root,root,755)
@@ -910,6 +922,13 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.239 2009/08/12 23:12:31 hawk
+- DEVEL merge:
+ - ubuntu was not dropped by upstream, it is now supported by
+ vserver-ditro-debian, updated descriptions and moved O: to proper place
+ - fixed vserver-distro-redhat and vserver-distro-fedora, more verbose
+ files
+
Revision 1.238 2009/08/12 23:06:17 hawk
- fixed adapter mistake
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver.spec?r1=1.238&r2=1.239&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
