X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=slicerepo.spec;h=1c0a194740bd54824b5b36cccf5b7957d0a23e4b;hb=353517210c88d677c8ef7428c1f83709138f6251;hp=7e8d4b475cda5d787cd892f10ea9a32290af843c;hpb=bf875be66195318943b34cd86845f9d83c0bdeb4;p=nodeimage.git

diff --git a/slicerepo.spec b/slicerepo.spec
index 7e8d4b4..1c0a194 100644
--- a/slicerepo.spec
+++ b/slicerepo.spec
@@ -1,8 +1,3 @@
-#
-# $Id$
-#
-%define url $URL$
-
 # build is expected to export the following rpm variables
 # %{distroname}     : e.g. Fedora
 # %{distrorelease}  : e.g. 8
@@ -13,7 +8,7 @@
 
 %define name slicerepo-%{nodefamily}
 %define version 2.0
-%define taglevel 6
+%define taglevel 7
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -22,7 +17,7 @@
 Vendor: OneLab
 Packager: PlanetLab Europe <build@onelab.eu>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
 Summary: The yum repository for slices, to be installed on the myplc-side
 Name: %{name}
@@ -75,6 +70,10 @@ service plc start packages
 %config(noreplace) /var/www/html/install-rpms/slice-%{nodefamily}/yumgroups.xml
 
 %changelog
+* Sun Jan 23 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-7
+- yum repo template for f14 nodes
+- tweaks the way /etc/plc.d/packages works
+
 * Mon Jul 05 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - BootstrapFS-2.0-6
 - add sha1sum
 - module name changes