X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=noderepo.spec;h=f213061ce45e8d197b53cc1e4d75668dab8f4c5e;hb=296b3d4af2f78b2f8c401748685b6cdf1b8dfcd7;hp=7ce902262808ad5969ea1bb94f87deb617e89dd3;hpb=460a95b6828a48c7d7b20372ffbb6c20e4e2142d;p=bootstrapfs.git

diff --git a/noderepo.spec b/noderepo.spec
index 7ce9022..f213061 100644
--- a/noderepo.spec
+++ b/noderepo.spec
@@ -8,11 +8,12 @@
 # %{distrorelease}  : e.g. 8
 # %{node_rpms_plus} : as a +++ separated list of rpms from the build dir
 
-%define nodefamily %{pldistro}-%{_arch}
+%define nodefamily %{pldistro}-%{distroname}-%{_arch}
+%define obsolete_nodefamily %{pldistro}-%{_arch}
 
 %define name noderepo-%{nodefamily}
-%define version 1.0
-%define taglevel 8
+%define version 2.0
+%define taglevel 0
 
 # pldistro already in the rpm name
 #%define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}
@@ -37,6 +38,10 @@ BuildArch: noarch
 BuildRequires: rsync 
 Requires: myplc
 
+# 5.0 now has 3-fold nodefamily
+%define obsolete_nodefamily %{pldistro}-%{_arch}
+Obsoletes: noderepo-%{obsolete_nodefamily}
+
 %define debug_package %{nil}
 
 %description
@@ -74,6 +79,15 @@ service plc start packages
 %config(noreplace) /var/www/html/install-rpms/%{nodefamily}/yumgroups.xml
 
 %changelog
+* Mon Jan 04 2010 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-1.0-11
+- for building on fedora12
+
+* Thu Oct 22 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-1.0-10
+- cosmetic change in message at build-time
+
+* Fri Oct 09 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-1.0-9
+- can use groups in the pkgs file with +++ for space
+
 * Tue Apr 07 2009 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> - BootstrapFS-1.0-8
 - bugfix for when a .post script is not needed
 
@@ -105,3 +119,5 @@ service plc start packages
 
 * Tue Mar 4 2008 Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr> -
 - Initial build.
+
+%define module_current_branch 1.0