packages (DEVEL): util-vserver/util-vserver.spec - there is now one templat...

[hawk]

Author: hawk                         Date: Wed Apr 29 11:38:44 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- there is now one template for all Debians and Ubuntus

---- Files affected:
packages/util-vserver:
   util-vserver.spec (1.223.2.2 -> 1.223.2.3) 

---- Diffs:

================================================================
Index: packages/util-vserver/util-vserver.spec
diff -u packages/util-vserver/util-vserver.spec:1.223.2.2 packages/util-vserver/util-vserver.spec:1.223.2.3
--- packages/util-vserver/util-vserver.spec:1.223.2.2	Tue Apr 28 22:04:12 2009
+++ packages/util-vserver/util-vserver.spec	Wed Apr 29 13:38:39 2009
@@ -258,11 +258,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.
@@ -347,19 +349,6 @@
 %description -n vserver-distro-suse -l pl.UTF-8
 Szablon do tworzenia VServerów dla dystrybucji SuSE 9.1.
 
-%package -n vserver-distro-ubuntu
-Summary:	VServer build templates for Ubuntu
-Summary(pl.UTF-8):	Szablony do tworzenia VServerów dla dystrybucji Ubuntu
-Group:		Applications/System
-Requires:	%{name} = %{version}-%{release}
-Requires:	dpkg
-
-%description -n vserver-distro-ubuntu
-VServer build templates for Ubuntu.
-
-%description -n vserver-distro-ubuntu -l pl.UTF-8
-Szablony do tworzenia VServerów dla dystrybucji Ubuntu.
-
 %prep
 %setup -q -n %{name}-%{version}-%{pre} -a11
 %patch0 -p1
@@ -897,22 +886,15 @@
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/vservers/.distributions/suse*/apt/sources.list
 %{_libdir}/%{name}/distributions/suse*
 
-#%files -n vserver-distro-ubuntu
-#%defattr(644,root,root,755)
-#%{_libdir}/%{name}/distributions/breezy
-#%{_libdir}/%{name}/distributions/dapper
-#%{_libdir}/%{name}/distributions/edgy
-#%{_libdir}/%{name}/distributions/feisty
-#%{_libdir}/%{name}/distributions/gutsy
-#%{_libdir}/%{name}/distributions/hoary
-#%{_libdir}/%{name}/distributions/warty
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.223.2.3  2009/04/29 11:38:39  hawk
+- there is now one template for all Debians and Ubuntus
+
 Revision 1.223.2.2  2009/04/28 20:04:12  hawk
 - package exec-remount
 - fixed packaging redhat scripts
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-vserver/util-vserver.spec?r1=1.223.2.2&r2=1.223.2.3&f=u