X-Git-Url: http://git.onelab.eu/?p=bootstrapfs.git;a=blobdiff_plain;f=slicerepo.spec;h=eda535587f98efdca5e4f7f3fdd5e668d37391ee;hp=4e405e1a66d8edbc15f725e6f348b2206a82e48b;hb=93d5af679f27df402ba8f2f06860d34bc331a828;hpb=ee50ab5ee36234b25f63068c7911772dd7a70a97

diff --git a/slicerepo.spec b/slicerepo.spec
index 4e405e1..eda5355 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,18 +8,24 @@
 
 %define name slicerepo-%{nodefamily}
 %define version 2.0
-%define taglevel 0
+%define taglevel 12
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 %define release %{taglevel}%{?date:.%{date}}
 
-Vendor: PlanetLab
-Packager: PlanetLab Central <support@planet-lab.org>
+# we don't really need the standard postinstall process from rpm that
+# strips files and byte-compiles python files. all files in this
+# package are comming from other rpm files and they've already went
+# through this post install processing. - baris
+%define __os_install_post %{nil}
+
+Vendor: OneLab
+Packager: PlanetLab Europe <build@onelab.eu>
 Distribution: PlanetLab %{plrelease}
-URL: %(echo %{url} | cut -d ' ' -f 2)
+URL: %{SCMURL}
 
-Summary: The initial content of the yum repository for nodes
+Summary: The yum repository for slices, to be installed on the myplc-side
 Name: %{name}
 Version: %{version}
 Release: %{release}
@@ -38,14 +39,10 @@ BuildArch: noarch
 BuildRequires: rsync 
 Requires: myplc
 
-# 5.0 now has 3-fold nodefamily
-%define obsolete_nodefamily %{pldistro}-%{_arch}
-Obsoletes: slicerepo-%{obsolete_nodefamily}
-
 %define debug_package %{nil}
 
 %description
-This rpm contains all the rpms designed for running on a PlanetLab node
+This rpm contains all the rpms that might ship on a sliver image
 they come organized into a yum repository 
 
 %prep
@@ -74,8 +71,46 @@ service plc start packages
 
 %files
 %defattr(-,root,root,-)
-/var/www/html/install-rpms/%{nodefamily}
+/var/www/html/install-rpms/slice-%{nodefamily}
 # don't overwrite yumgroups.xml if exists
-%config(noreplace) /var/www/html/install-rpms/%{nodefamily}/yumgroups.xml
+%config(noreplace) /var/www/html/install-rpms/slice-%{nodefamily}/yumgroups.xml
 
 %changelog
+* Fri Jun 10 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-12
+- minor tweak in plc.d/packages
+
+* Mon Jun 06 2011 Baris Metin <bmetin@verivue.com> - bootstrapfs-2.0-11
+- sl6 templates
+
+* Thu Feb 17 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-10
+- bugfix for multi-flavour deployments
+
+* Fri Feb 04 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-9
+- for multi-flavours : 'packages' step in plc.d now handles vserver links and related hacks in yumgroups
+
+* Thu Jan 27 2011 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - bootstrapfs-2.0-8
+- no semantic change - attempt to speed up build
+
+* 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
+
+* Tue Apr 27 2010 Talip Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - BootstrapFS-2.0-5
+- support different flavours of vservers on nodes
+
+* Mon Apr 12 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-2.0-4
+- fix unmatched $ in URL svn keywords
+
+* Fri Apr 02 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-2.0-3
+- choice between various pldistros is not made at build time, but at run time
+- relies on GetNodeFlavour to expose the node's fcdistro - requires PLCAPI-5.0-5
+- in addition, the baseurl for the myplc repo is http:// and not https:// anymore
+- the https method does not work on fedora 12, and GPG is used below anyway
+
+* Fri Mar 12 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-2.0-2
+- new slicerepo package for exposing stuff to slivers
+