X-Git-Url: http://git.onelab.eu/?p=vserver-reference.git;a=blobdiff_plain;f=sliceimage.spec;h=89abe0dbd0a4bf8113a28e9ff5bd1a9de09ab253;hp=8bd618b02d5911e53e92137456f00e6564065aa4;hb=HEAD;hpb=06df74cb5dbab5cb40c2c26db60a1ca271f08273

diff --git a/sliceimage.spec b/sliceimage.spec
index 8bd618b..89abe0d 100644
--- a/sliceimage.spec
+++ b/sliceimage.spec
@@ -1,7 +1,7 @@
 %define slicefamily %{pldistro}-%{distroname}-%{_arch}
 
 # historically there was one dummy 'sliceimage' package, and 
-# then 2 subpackages with %{slicefamily} and system-%{slicefamily}
+# then 2 subpackages with {slicefamily} and system-{slicefamily}
 # however the python spec2make that we need to use on f>=15 is dumb
 # it cannot detect it's an empty/dummy package, and thus includes it
 # in e.g. noderepo, which fails
@@ -12,7 +12,6 @@
 %define taglevel 12
 
 # pldistro already in the rpm name
-#%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define release %{taglevel}%{?date:.%{date}}
 
 
@@ -43,7 +42,7 @@ License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 # in 5.0, this package was named vserver-<>
-Obsoletes: vserver-%{slicefamily}
+# Obsoletes: vserver-{slicefamily}
 # this would not be right
 #BuildArch: noarch
 AutoReqProv: no